diff --git a/cmake/OptionalSource.cmake b/cmake/OptionalSource.cmake
index ebaa2b686..2b816984f 100644
--- a/cmake/OptionalSource.cmake
+++ b/cmake/OptionalSource.cmake
@@ -13,6 +13,10 @@ macro(optional_source TOGGLE)
   else(${TOGGLE})
     list(APPEND OTHER_SOURCES ${OPTIONAL_SOURCE_SOURCES})
     list(APPEND OTHER_SOURCES ${OPTIONAL_SOURCE_HEADERS})
-    qt4_wrap_ui(OTHER_SOURCES ${OPTIONAL_SOURCE_UI})
+
+    set(_uic_sources)
+    qt4_wrap_ui(_uic_sources ${OPTIONAL_SOURCE_UI})
+    list(APPEND OTHER_SOURCES ${_uic_sources})
+    list(APPEND OTHER_UIC_SOURCES ${_uic_sources})
   endif(${TOGGLE})
 endmacro(optional_source)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e494c5bfd..e8271db5b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -626,6 +626,8 @@ set(RESOURCES
   ../data/data.qrc
 )
 
+set(OTHER_SOURCES)
+
 set(LINGUAS "All" CACHE STRING "A space-seperated list of translations to compile in to Clementine, or \"None\".")
 if (LINGUAS STREQUAL "All")
   # build LANGUAGES from all existing .po files
@@ -958,6 +960,7 @@ add_library(clementine_lib STATIC
   ${QRC}
   ${POT}
   ${PO}
+  ${OTHER_UIC_SOURCES}
 )
 
 add_dependencies(clementine_lib pot)