diff --git a/tdelfeditor/CMakeLists.txt b/tdelfeditor/CMakeLists.txt
index 46e6215f6..3f2d2cdfb 100644
--- a/tdelfeditor/CMakeLists.txt
+++ b/tdelfeditor/CMakeLists.txt
@@ -1,6 +1,6 @@
 #################################################
 #
-#  (C) 2011 Timothy Pearson
+#  (C) 2011-2014 Timothy Pearson
 #  kb9vqf (AT) pearsoncomputing.net
 #
 #  Improvements and feedback are welcome
@@ -55,6 +55,8 @@ if( NOT "${TDE_SCM_MODULE_NAME}" STREQUAL "" )
       update_libDCOP_metadata ALL
       COMMAND ${CMAKE_BINARY_DIR}/tdelfeditor/tdelfeditor -m ${CMAKE_BINARY_DIR}/dcop/libDCOP.so ${ELF_EMBEDDING_METADATA} || true
       COMMAND ${CMAKE_BINARY_DIR}/tdelfeditor/tdelfeditor -e ${CMAKE_BINARY_DIR}/dcop/libDCOP.so || true
+      COMMAND ${CMAKE_BINARY_DIR}/tdelfeditor/tdelfeditor -m ${CMAKE_BINARY_DIR}/dcop/libDCOP.so.${_version} ${ELF_EMBEDDING_METADATA} || true
+      COMMAND ${CMAKE_BINARY_DIR}/tdelfeditor/tdelfeditor -e ${CMAKE_BINARY_DIR}/dcop/libDCOP.so.${_version} || true
       DEPENDS tdelfeditor
       DEPENDS DCOP-shared
       COMMENT "Storing SCM metadata in dcop/libDCOP.so"
@@ -68,12 +70,14 @@ if( NOT "${TDE_SCM_MODULE_NAME}" STREQUAL "" )
       update_libtdecore_metadata ALL
       COMMAND ${CMAKE_BINARY_DIR}/tdelfeditor/tdelfeditor -m ${CMAKE_BINARY_DIR}/tdecore/libtdecore.so ${ELF_EMBEDDING_METADATA} || true
       COMMAND ${CMAKE_BINARY_DIR}/tdelfeditor/tdelfeditor -e ${CMAKE_BINARY_DIR}/tdecore/libtdecore.so || true
+      COMMAND ${CMAKE_BINARY_DIR}/tdelfeditor/tdelfeditor -m ${CMAKE_BINARY_DIR}/tdecore/libtdecore.so.${_version} ${ELF_EMBEDDING_METADATA} || true
+      COMMAND ${CMAKE_BINARY_DIR}/tdelfeditor/tdelfeditor -e ${CMAKE_BINARY_DIR}/tdecore/libtdecore.so.${_version} || true
       DEPENDS tdelfeditor
       DEPENDS tdecore-shared
       COMMENT "Storing SCM metadata in tdecore/libtdecore.so"
     )
 
-    get_target_property( _version tdeio-shared VERSION )
+    #get_target_property( _version tdeio-shared VERSION )
     set( ELF_EMBEDDING_METADATA "\"tdeio-shared\" \"\" \"\" \"\" \"\" \"Trinity Desktop Environment\" \"\" \"${_version}\" \"${_datetime}\" \"x-sharedlib\" \"${TDE_SCM_MODULE_NAME}\" \"${TDE_SCM_MODULE_REVISION}\" \"\"" )
     separate_arguments( ELF_EMBEDDING_METADATA )
     add_custom_target(
@@ -81,12 +85,14 @@ if( NOT "${TDE_SCM_MODULE_NAME}" STREQUAL "" )
       update_libtdeio_metadata ALL
       COMMAND ${CMAKE_BINARY_DIR}/tdelfeditor/tdelfeditor -m ${CMAKE_BINARY_DIR}/tdeio/libtdeio.so ${ELF_EMBEDDING_METADATA} || true
       COMMAND ${CMAKE_BINARY_DIR}/tdelfeditor/tdelfeditor -e ${CMAKE_BINARY_DIR}/tdeio/libtdeio.so || true
+      COMMAND ${CMAKE_BINARY_DIR}/tdelfeditor/tdelfeditor -m ${CMAKE_BINARY_DIR}/tdeio/libtdeio.so.${_version} ${ELF_EMBEDDING_METADATA} || true
+      COMMAND ${CMAKE_BINARY_DIR}/tdelfeditor/tdelfeditor -e ${CMAKE_BINARY_DIR}/tdeio/libtdeio.so.${_version} || true
       DEPENDS tdelfeditor
       DEPENDS tdeio-shared
       COMMENT "Storing SCM metadata in tdeui/libtdeio.so"
     )
 
-    get_target_property( _version tdeui-shared VERSION )
+    #get_target_property( _version tdeui-shared VERSION )
     set( ELF_EMBEDDING_METADATA "\"tdeui-shared\" \"\" \"\" \"\" \"\" \"Trinity Desktop Environment\" \"\" \"${_version}\" \"${_datetime}\" \"x-sharedlib\" \"${TDE_SCM_MODULE_NAME}\" \"${TDE_SCM_MODULE_REVISION}\" \"\"" )
     separate_arguments( ELF_EMBEDDING_METADATA )
     add_custom_target(
@@ -94,12 +100,14 @@ if( NOT "${TDE_SCM_MODULE_NAME}" STREQUAL "" )
       update_libtdeui_metadata ALL
       COMMAND ${CMAKE_BINARY_DIR}/tdelfeditor/tdelfeditor -m ${CMAKE_BINARY_DIR}/tdeui/libtdeui.so ${ELF_EMBEDDING_METADATA} || true
       COMMAND ${CMAKE_BINARY_DIR}/tdelfeditor/tdelfeditor -e ${CMAKE_BINARY_DIR}/tdeui/libtdeui.so || true
+      COMMAND ${CMAKE_BINARY_DIR}/tdelfeditor/tdelfeditor -m ${CMAKE_BINARY_DIR}/tdeui/libtdeui.so.${_version} ${ELF_EMBEDDING_METADATA} || true
+      COMMAND ${CMAKE_BINARY_DIR}/tdelfeditor/tdelfeditor -e ${CMAKE_BINARY_DIR}/tdeui/libtdeui.so.${_version} || true
       DEPENDS tdelfeditor
       DEPENDS tdeui-shared
       COMMENT "Storing SCM metadata in tdeui/libtdeui.so"
     )
 
-    get_target_property( _version tdeutils-shared VERSION )
+    #get_target_property( _version tdeutils-shared VERSION )
     set( ELF_EMBEDDING_METADATA "\"tdeutils-shared\" \"\" \"\" \"\" \"\" \"Trinity Desktop Environment\" \"\" \"${_version}\" \"${_datetime}\" \"x-sharedlib\" \"${TDE_SCM_MODULE_NAME}\" \"${TDE_SCM_MODULE_REVISION}\" \"\"" )
     separate_arguments( ELF_EMBEDDING_METADATA )
     add_custom_target(
@@ -107,12 +115,14 @@ if( NOT "${TDE_SCM_MODULE_NAME}" STREQUAL "" )
       update_libtdeutils_metadata ALL
       COMMAND ${CMAKE_BINARY_DIR}/tdelfeditor/tdelfeditor -m ${CMAKE_BINARY_DIR}/tdeutils/libtdeutils.so ${ELF_EMBEDDING_METADATA} || true
       COMMAND ${CMAKE_BINARY_DIR}/tdelfeditor/tdelfeditor -e ${CMAKE_BINARY_DIR}/tdeutils/libtdeutils.so || true
+      COMMAND ${CMAKE_BINARY_DIR}/tdelfeditor/tdelfeditor -m ${CMAKE_BINARY_DIR}/tdeutils/libtdeutils.so.${_version} ${ELF_EMBEDDING_METADATA} || true
+      COMMAND ${CMAKE_BINARY_DIR}/tdelfeditor/tdelfeditor -e ${CMAKE_BINARY_DIR}/tdeutils/libtdeutils.so.${_version} || true
       DEPENDS tdelfeditor
       DEPENDS tdeutils-shared
       COMMENT "Storing SCM metadata in tdeutils/libtdeutils.so"
     )
 
-    get_target_property( _version tdeprint-shared VERSION )
+    #get_target_property( _version tdeprint-shared VERSION )
     set( ELF_EMBEDDING_METADATA "\"tdeprint-shared\" \"\" \"\" \"\" \"\" \"Trinity Desktop Environment\" \"\" \"${_version}\" \"${_datetime}\" \"x-sharedlib\" \"${TDE_SCM_MODULE_NAME}\" \"${TDE_SCM_MODULE_REVISION}\" \"\"" )
     separate_arguments( ELF_EMBEDDING_METADATA )
     add_custom_target(
@@ -120,12 +130,14 @@ if( NOT "${TDE_SCM_MODULE_NAME}" STREQUAL "" )
       update_libtdeprint_metadata ALL
       COMMAND ${CMAKE_BINARY_DIR}/tdelfeditor/tdelfeditor -m ${CMAKE_BINARY_DIR}/tdeprint/libtdeprint.so ${ELF_EMBEDDING_METADATA} || true
       COMMAND ${CMAKE_BINARY_DIR}/tdelfeditor/tdelfeditor -e ${CMAKE_BINARY_DIR}/tdeprint/libtdeprint.so || true
+      COMMAND ${CMAKE_BINARY_DIR}/tdelfeditor/tdelfeditor -m ${CMAKE_BINARY_DIR}/tdeprint/libtdeprint.so.${_version} ${ELF_EMBEDDING_METADATA} || true
+      COMMAND ${CMAKE_BINARY_DIR}/tdelfeditor/tdelfeditor -e ${CMAKE_BINARY_DIR}/tdeprint/libtdeprint.so.${_version} || true
       DEPENDS tdelfeditor
       DEPENDS tdeprint-shared
       COMMENT "Storing SCM metadata in tdeprint/libtdeprint.so"
     )
 
-    get_target_property( _version tdehtml-shared VERSION )
+    #get_target_property( _version tdehtml-shared VERSION )
     set( ELF_EMBEDDING_METADATA "\"tdehtml-shared\" \"\" \"\" \"\" \"\" \"Trinity Desktop Environment\" \"\" \"${_version}\" \"${_datetime}\" \"x-sharedlib\" \"${TDE_SCM_MODULE_NAME}\" \"${TDE_SCM_MODULE_REVISION}\" \"\"" )
     separate_arguments( ELF_EMBEDDING_METADATA )
     add_custom_target(
@@ -133,6 +145,8 @@ if( NOT "${TDE_SCM_MODULE_NAME}" STREQUAL "" )
       update_libtdehtml_metadata ALL
       COMMAND ${CMAKE_BINARY_DIR}/tdelfeditor/tdelfeditor -m ${CMAKE_BINARY_DIR}/tdehtml/libtdehtml.so ${ELF_EMBEDDING_METADATA} || true
       COMMAND ${CMAKE_BINARY_DIR}/tdelfeditor/tdelfeditor -e ${CMAKE_BINARY_DIR}/tdehtml/libtdehtml.so || true
+      COMMAND ${CMAKE_BINARY_DIR}/tdelfeditor/tdelfeditor -m ${CMAKE_BINARY_DIR}/tdehtml/libtdehtml.so.${_version} ${ELF_EMBEDDING_METADATA} || true
+      COMMAND ${CMAKE_BINARY_DIR}/tdelfeditor/tdelfeditor -e ${CMAKE_BINARY_DIR}/tdehtml/libtdehtml.so.${_version} || true
       DEPENDS tdelfeditor
       DEPENDS tdehtml-shared
       COMMENT "Storing SCM metadata in tdehtml/libtdehtml.so"