diff --git a/libRTI/CMakeLists.txt b/libRTI/CMakeLists.txt
index f86166d..2281794 100644
--- a/libRTI/CMakeLists.txt
+++ b/libRTI/CMakeLists.txt
@@ -1,10 +1,43 @@
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/libCERTI)
 
+##########################################################
+# VariableLenghtData
+#################################
+SET(VARDATA1516_SRCS
+  RTI1516variableLengthData.cpp
+  RTI1516variableLengthDataImplementation.h
+   ../include/RTI/VariableLengthData.h
+)
+
+SOURCE_GROUP("Source Files\\VarData" FILES ${VARDATA1516_SRCS})
+
+ADD_LIBRARY(VarData1516
+    ${VARDATA1516_SRCS}
+)
+
+# Correct line
+TARGET_LINK_LIBRARIES(VarData1516)
+# Incorrect line
+#TARGET_LINK_LIBRARIES(FedTime1516 RTI1516)
+
+SET_TARGET_PROPERTIES(VarData1516 PROPERTIES PROJECT_LABEL LibVarData1516)
+SET_TARGET_PROPERTIES(VarData1516 PROPERTIES COMPILE_FLAGS "-DRTI_DISABLE_WARNINGS")
+
+IF (MINGW)
+    SET_TARGET_PROPERTIES(VarData1516 PROPERTIES LINK_FLAGS "-Wl,--output-def,${LIBRARY_OUTPUT_PATH}/libVarData1516.def")
+    INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/libVarData1516.def
+            DESTINATION lib)
+ENDIF (MINGW)
+
+SET_TARGET_PROPERTIES(VarData1516 PROPERTIES VERSION 1.0.0 SOVERSION 1)
+
+##########################
+# RTI1516
+##########################
+
 SET(RTI1516_LIB_SRCS
   RTI1516ambassadorFactory.cpp
   RTI1516exception.cpp
-  RTI1516variableLengthData.cpp
-  RTI1516variableLengthDataImplementation.h
   RTI1516ambassador.cpp
   RTI1516ambassador.h
   RTI1516ambPrivateRefs.cpp
@@ -34,7 +67,6 @@ SET(RTI1516_LIB_INCLUDE
    ../include/RTI/RTIambassadorFactory.h
    ../include/RTI/SpecificConfig.h
    ../include/RTI/Typedefs.h
-   ../include/RTI/VariableLengthData.h
 )
 
 SET(RTI_LIB_SRCS
@@ -82,7 +114,7 @@ ADD_LIBRARY(RTI1516 ${RTI1516_LIB_SRCS} ${RTI1516_LIB_INCLUDE})
 # Incorrect line
 #TARGET_LINK_LIBRARIES(RTI1516 CERTI)
 # Correct line
-TARGET_LINK_LIBRARIES(RTI1516 CERTI FedTime1516)
+TARGET_LINK_LIBRARIES(RTI1516 CERTI FedTime1516 VarData1516)
 
 MESSAGE(STATUS "libRTI variant: HLA 1516")
 SET_TARGET_PROPERTIES(RTI1516 PROPERTIES OUTPUT_NAME "RTI1516")
@@ -160,7 +192,7 @@ ADD_LIBRARY(FedTime1516
 )
 
 # Correct line
-TARGET_LINK_LIBRARIES(FedTime1516)
+TARGET_LINK_LIBRARIES(FedTime1516 VarData1516)
 # Incorrect line
 #TARGET_LINK_LIBRARIES(FedTime1516 RTI1516)
 
@@ -188,7 +220,7 @@ SET(TestFedTime1516_SRCS
 
 
 # Install rules for both libRTI-NG and libFedTime
-INSTALL(TARGETS RTI FedTime RTI1516 FedTime1516
+INSTALL(TARGETS RTI FedTime RTI1516 FedTime1516 VarData1516
     RUNTIME DESTINATION bin
     LIBRARY DESTINATION lib
     ARCHIVE DESTINATION lib)