diff --git a/CMakeLists.txt b/CMakeLists.txt
index a77fc86..4dc3906 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -121,7 +121,7 @@ target_compile_definitions(${TOOLS_TARGET} PUBLIC  BUILD_NR=${BUILD_NUMBER} MAJ_
 #TODO: Different flags for Release/Debug
 add_compile_options(-O3 -m32 -MMD -MP -Wall -ggdb)
 if (UNIX)
-	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-rpath='$ORIGIN'")
+	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-rpath,'$ORIGIN',-rpath,/usr/lib"					)
 	target_link_libraries(${RUNTIME_TARGET} xcb xcb-randr boost_regex)
 	target_link_libraries(${ASSEMBLER_TARGET} xcb xcb-randr boost_regex)
 	target_link_libraries(${TOOLS_TARGET} xcb xcb-randr boost_regex)
diff --git a/build.nr b/build.nr
index 480d250..6e2eace 100644
--- a/build.nr
+++ b/build.nr
@@ -1 +1 @@
-1610
+1613
diff --git a/extra/dss/bios_api.dss b/extra/dss/bios_api.dss
index 549f2fc..87f9ccc 100644
--- a/extra/dss/bios_api.dss
+++ b/extra/dss/bios_api.dss
@@ -1,5 +1,5 @@
 ## --
-## -- This file is automatically generated by the DragonAssembler (version 0.4.1608) 
+## -- This file is automatically generated by the DragonAssembler (version 0.4.1612) 
 ## -- Please do not modify this file in any way. 
 ## --