diff --git a/cmake/Modules/FindGettextLib.cmake b/cmake/Modules/FindGettextLib.cmake
index 18935eaa..5779b6b6 100644
--- a/cmake/Modules/FindGettextLib.cmake
+++ b/cmake/Modules/FindGettextLib.cmake
@@ -41,7 +41,6 @@ IF (WIN32)
 		DOC "gettext *iconv*.lib")
 ENDIF(WIN32)
 
-
 IF(GETTEXT_INCLUDE_DIR AND GETTEXT_MSGFMT)
 	IF (WIN32)
 		# in the Win32 case check also for the extra linking requirements
@@ -49,6 +48,10 @@ IF(GETTEXT_INCLUDE_DIR AND GETTEXT_MSGFMT)
 			SET(GETTEXT_FOUND TRUE)
 		ENDIF()
 	ELSE(WIN32)
+		# *BSD variants require special linkage as they don't use glibc
+		IF(${CMAKE_SYSTEM_NAME} MATCHES "BSD")
+			SET(GETTEXT_LIBRARY "intl")
+		ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "BSD")
 		SET(GETTEXT_FOUND TRUE)
 	ENDIF(WIN32)
 ENDIF()
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 883b809e..0fceb85e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -173,7 +173,7 @@ include_directories(
 	${SQLITE3_INCLUDE_DIR}
 )
 
-set(EXECUTABLE_OUTPUT_PATH ../bin)
+set(EXECUTABLE_OUTPUT_PATH "${CMAKE_SOURCE_DIR}/bin")
 
 if(BUILD_CLIENT)
 	add_executable(${PROJECT_NAME} ${minetest_SRCS})
diff --git a/src/debug.cpp b/src/debug.cpp
index a1918623..befd73a3 100644
--- a/src/debug.cpp
+++ b/src/debug.cpp
@@ -68,9 +68,9 @@ Nullstream dummyout;
 void assert_fail(const char *assertion, const char *file,
 		unsigned int line, const char *function)
 {
-	DEBUGPRINT("\nIn thread %x:\n"
+	DEBUGPRINT("\nIn thread %lx:\n"
 			"%s:%d: %s: Assertion '%s' failed.\n",
-			(unsigned int)get_current_thread_id(),
+			(unsigned long)get_current_thread_id(),
 			file, line, function, assertion);
 	
 	debug_stacks_print();
@@ -95,8 +95,8 @@ DebugStack::DebugStack(threadid_t id)
 
 void DebugStack::print(FILE *file, bool everything)
 {
-	fprintf(file, "DEBUG STACK FOR THREAD %x:\n",
-			(unsigned int)threadid);
+	fprintf(file, "DEBUG STACK FOR THREAD %lx:\n",
+			(unsigned long)threadid);
 
 	for(int i=0; i<stack_max_i; i++)
 	{