diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index 7be5f9baf..90d78be21 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -9,6 +9,8 @@
 #
 #################################################
 
+tde_setup_architecture_flags( )
+
 # termios.h (tdm, kioslave)
 if( BUILD_TDM OR BUILD_KIOSLAVES )
   check_include_file( termios.h HAVE_TERMIOS_H )
diff --git a/kdesktop/lock/CMakeLists.txt b/kdesktop/lock/CMakeLists.txt
index 7a351210b..caa655f59 100644
--- a/kdesktop/lock/CMakeLists.txt
+++ b/kdesktop/lock/CMakeLists.txt
@@ -2,6 +2,8 @@
 #
 #  (C) 2010-2011 Serghei Amelian
 #  serghei (DOT) amelian (AT) gmail.com
+#  (C) 2012 Timothy Pearson
+#  kb9vqf (AT) pearsoncomputing.net
 #
 #  Improvements and feedback are welcome
 #
@@ -35,6 +37,6 @@ set( ${target}_SRCS
 
 tde_add_executable( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK kdesktopsettings-static dmctl-static kio-shared Xext ${GL_LIBRARY} "-z\ now"
+  LINK kdesktopsettings-static dmctl-static kio-shared Xext ${GL_LIBRARY} "${LINKER_IMMEDIATE_BINDING_FLAGS}"
   DESTINATION ${BIN_INSTALL_DIR}
 )