diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt
index 847c5b7081..b3dfb980f5 100644
--- a/po/CMakeLists.txt
+++ b/po/CMakeLists.txt
@@ -27,7 +27,7 @@ SET_LOCAL_DIST(po_DIST_local ${po_SOURCES} CMakeLists.txt ChangeLog Makevars POT
 SET(po_DIST ${po_DIST_local} ${po_glossary_DIST} PARENT_SCOPE)
 
 FOREACH(lingua ${ALL_LINGUAS})
-  SET(_OUTPUT_FILE ${lingua}.gmo)
+  SET(_OUTPUT_FILE ${lingua}.mo)
   LIST(APPEND CATALOGS ${_OUTPUT_FILE})
   ADD_CUSTOM_COMMAND(
       OUTPUT ${_OUTPUT_FILE}
@@ -35,11 +35,11 @@ FOREACH(lingua ${ALL_LINGUAS})
   )
   SET(_BUILD_FILE_DIR ${DATADIR_BUILD}/locale/${lingua}/LC_MESSAGES)
   MAKE_DIRECTORY(${_BUILD_FILE_DIR})
-  SET(_BUILD_FILE ${_BUILD_FILE_DIR}/gnucash.gmo)
+  SET(_BUILD_FILE ${_BUILD_FILE_DIR}/gnucash.mo)
   LIST(APPEND BUILD_CATALOGS ${_BUILD_FILE})
   ADD_CUSTOM_COMMAND(
     OUTPUT ${_BUILD_FILE}
-    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/${lingua}.gmo ${_BUILD_FILE}
+    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/${lingua}.mo ${_BUILD_FILE}
     DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${_OUTPUT_FILE}
     #APPEND
   )
@@ -50,7 +50,7 @@ ADD_CUSTOM_TARGET(po-gmo-build ALL DEPENDS ${BUILD_CATALOGS})
 
 
 FOREACH(lingua ${ALL_LINGUAS})
-  INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${lingua}.gmo RENAME gnucash.mo DESTINATION share/locale/${lingua}/LC_MESSAGES)
+  INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${lingua}.mo RENAME gnucash.mo DESTINATION share/locale/${lingua}/LC_MESSAGES)
 ENDFOREACH(lingua)
 
 
diff --git a/src/gnome-search/CMakeLists.txt b/src/gnome-search/CMakeLists.txt
index 5b9b42e5d6..50c428552b 100644
--- a/src/gnome-search/CMakeLists.txt
+++ b/src/gnome-search/CMakeLists.txt
@@ -62,3 +62,9 @@ INSTALL(FILES ${gnome_search_HEADERS} DESTINATION include/gnucash)
 SET(gnome_search_GLADE dialog-search.glade)
 
 INSTALL(FILES ${gnome_search_GLADE} DESTINATION share/gnucash/gtkbuilder)
+
+FILE(COPY .
+    DESTINATION ${DATADIR_BUILD}/gnucash/gtkbuilder
+    PATTERN Makefile.* EXCLUDE
+    PATTERN CMakeLists.txt EXCLUDE)
+