diff --git a/uwac/CMakeLists.txt b/uwac/CMakeLists.txt
index cbfecb86a..dc8c9f00d 100644
--- a/uwac/CMakeLists.txt
+++ b/uwac/CMakeLists.txt
@@ -15,6 +15,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# Soname versioning
+set(UWAC_VERSION_MAJOR "0")
+set(UWAC_VERSION_MINOR "0")
+set(UWAC_VERSION_REVISION "1")
+set(UWAC_VERSION "${UWAC_VERSION_MAJOR}.${UWAC_VERSION_MINOR}.${UWAC_VERSION_REVISION}")
+set(UWAC_VERSION_FULL "${UWAC_VERSION}")
+set(UWAC_API_VERSION "${UWAC_VERSION_MAJOR}")
+
 add_subdirectory(include)
 add_subdirectory(libuwac)
-
diff --git a/uwac/include/CMakeLists.txt b/uwac/include/CMakeLists.txt
index b6e7129b1..68587284e 100644
--- a/uwac/include/CMakeLists.txt
+++ b/uwac/include/CMakeLists.txt
@@ -16,5 +16,4 @@
 # limitations under the License.
 
 file(GLOB UWAC_HEADERS "uwac/*.h")
-install(FILES ${UWAC_HEADERS} DESTINATION include/uwac COMPONENT headers)
-
+install(FILES ${UWAC_HEADERS} DESTINATION include/uwac${UWAC_API_VERSION}/uwac COMPONENT headers)
diff --git a/uwac/libuwac/CMakeLists.txt b/uwac/libuwac/CMakeLists.txt
index 49a663407..4de932519 100644
--- a/uwac/libuwac/CMakeLists.txt
+++ b/uwac/libuwac/CMakeLists.txt
@@ -65,12 +65,12 @@ add_library(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})
 
 
 if (WITH_LIBRARY_VERSIONING)
-	#set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${UWAC_VERSION} SOVERSION ${UWAC_API_VERSION})
+	set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${UWAC_VERSION} SOVERSION ${UWAC_API_VERSION})
 endif()
 
-target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS} ${WAYLAND_LIBS} ${XKBCOMMON_LIBS})
+target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS} ${WAYLAND_LIBS} ${XKBCOMMON_LIBS} freerdp)
 
-install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} EXPORT Uwac)
+install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} EXPORT uwac)
 
 
 set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "uwac")