diff --git a/module/CMakeLists.txt b/module/CMakeLists.txt
index 4dfc477c..f4fabe42 100644
--- a/module/CMakeLists.txt
+++ b/module/CMakeLists.txt
@@ -1,6 +1,6 @@
 # just use the pgxs makefile
 ADD_CUSTOM_COMMAND( OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/dummy
-        COMMAND PGXS=${PGXS} PG_CONFIG=${PG_CONFIG} MODSRCDIR=${CMAKE_CURRENT_SOURCE_DIR} make -f ${CMAKE_CURRENT_SOURCE_DIR}/Makefile
+        COMMAND PGXS=${PGXS} PG_CONFIG=${PG_CONFIG} MODSRCDIR=${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_MAKE_PROGRAM} -f ${CMAKE_CURRENT_SOURCE_DIR}/Makefile
         COMMENT "Running external makefile ${PGXS}"
         )
 
diff --git a/nominatim/CMakeLists.txt b/nominatim/CMakeLists.txt
index 53b5073b..726ec4cc 100644
--- a/nominatim/CMakeLists.txt
+++ b/nominatim/CMakeLists.txt
@@ -1,4 +1,12 @@
 add_executable(nominatim export.c geometry.cpp import.c index.c input.c nominatim.c postgresql.c sprompt.c)
-
+include(CheckIncludeFile)
+CHECK_INCLUDE_FILE(byteswap.h HAVE_BYTESWAP_H)
+CHECK_INCLUDE_FILE(sys/endian.h HAVE_SYS_ENDIAN_H)
+if(HAVE_BYTESWAP_H)
+  target_compile_definitions(nominatim PRIVATE HAVE_BYTESWAP_H)
+endif(HAVE_BYTESWAP_H)
+if(HAVE_SYS_ENDIAN_H)
+  target_compile_definitions(nominatim PRIVATE HAVE_SYS_ENDIAN_H)
+endif(HAVE_SYS_ENDIAN_H)
 target_link_libraries(nominatim ${LIBXML2_LIBRARIES} ${ZLIB_LIBRARIES} ${BZIP2_LIBRARIES} ${PostgreSQL_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
 
diff --git a/nominatim/postgresql.h b/nominatim/postgresql.h
index 6a14e94e..7050fca4 100644
--- a/nominatim/postgresql.h
+++ b/nominatim/postgresql.h
@@ -7,7 +7,11 @@
 #define PG_OID_INT8			20
 #define PG_OID_INT4			23
 
+#if defined(HAVE_BYTESWAP_H)
 #include <byteswap.h>
+#elif defined(HAVE_SYS_ENDIAN_H)
+#include <sys/endian.h>
+#endif
 
 #if __BYTE_ORDER == __BIG_ENDIAN
 #define PGint16(x)	(x)