diff --git a/src/libs/CMakeLists.txt b/src/libs/CMakeLists.txt
index 7558275b0..90430c268 100644
--- a/src/libs/CMakeLists.txt
+++ b/src/libs/CMakeLists.txt
@@ -13,6 +13,11 @@ ADD_SUBDIRECTORY(raceengine)
 ADD_SUBDIRECTORY(learning)
 ADD_SUBDIRECTORY(math)
 ADD_SUBDIRECTORY(portability)
-ADD_SUBDIRECTORY(ephemeris)
-#ADD_SUBDIRECTORY(metar)
+
+# Work-in-progress 
+IF(NOT OPTION_OFFICIAL_ONLY)
+	ADD_SUBDIRECTORY(ephemeris)
+	#ADD_SUBDIRECTORY(metar)
+ENDIF()
+
 
diff --git a/src/libs/metar/CMakeLists.txt b/src/libs/metar/CMakeLists.txt
index af564abb3..cd128d790 100644
--- a/src/libs/metar/CMakeLists.txt
+++ b/src/libs/metar/CMakeLists.txt
@@ -23,6 +23,8 @@ ADD_LIBRARY(metar SHARED ${METAR_SOURCES})
 # Might not work with GCC 4.5 or + (non-robot modules crash at 1st reload = after 1 dlclose) 
 #SET_TARGET_PROPERTIES(learning PROPERTIES VERSION ${VERSION} SOVERSION 0.0.0)
 
+ADD_PLIB_LIBRARY(metar)
+
 IF(WIN32)
 	SD_INSTALL_FILES(BIN TARGETS metar)
 ELSE(WIN32)