diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5162d30..dba31e8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,8 @@
 # CMakeLists.txt has to be located in the project folder and cmake has to be
 # executed from 'project/build' with 'cmake ../'.
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 3.1)
+project(rock_tutorial VERSION 0.1 DESCRIPTION "Rock Tutorial")
 find_package(Rock)
-rock_init(rock_tutorial 0.1)
+rock_init()
+rock_feature(NOCURDIR)
 rock_standard_layout()
diff --git a/viz/CMakeLists.txt b/viz/CMakeLists.txt
index 50cd31e..d740fba 100644
--- a/viz/CMakeLists.txt
+++ b/viz/CMakeLists.txt
@@ -1,6 +1,13 @@
 
-rock_vizkit_plugin(rock_tutorial-viz
-    RockVisualization.cpp
+rock_find_qt5(OPTIONAL)
+rock_find_qt4(OPTIONAL)
+
+include(RockQt)
+
+rock_qt_vizkit_plugin(
+    TARGETPREFIX rock_tutorial-viz
+    QT4_SUFFIX ""
+    SOURCES RockVisualization.cpp
     MOC RockVisualization.hpp
     DEPS_PKGCONFIG base-types
     HEADERS RockVisualization.hpp)
diff --git a/viz/RockVisualization.cpp b/viz/RockVisualization.cpp
index 269b156..7248874 100644
--- a/viz/RockVisualization.cpp
+++ b/viz/RockVisualization.cpp
@@ -104,7 +104,5 @@ void RockVisualization::updateMainNode( osg::Node* node )
     rockModelPos->setAttitude(orientation);
 }
 
-//Macro that makes this plugin loadable in ruby, this is optional.
-VizkitQtPlugin(RockVisualization)
-
+VizkitQtPluginImpl(RockVisualization)
 }
diff --git a/viz/RockVisualization.hpp b/viz/RockVisualization.hpp
index d8551ae..0b87b9c 100644
--- a/viz/RockVisualization.hpp
+++ b/viz/RockVisualization.hpp
@@ -39,5 +39,6 @@ namespace vizkit3d
         Data* p;
     };
 
+VizkitQtPluginHeaderDecls(RockVisualization)
 }
 #endif // ROCKVISUALIZATION_H
diff --git a/viz/rock_tutorial-viz-qt5.pc.in b/viz/rock_tutorial-viz-qt5.pc.in
new file mode 100644
index 0000000..6b414cd
--- /dev/null
+++ b/viz/rock_tutorial-viz-qt5.pc.in
@@ -0,0 +1,12 @@
+prefix=@CMAKE_INSTALL_PREFIX@
+exec_prefix=@CMAKE_INSTALL_PREFIX@
+libdir=${prefix}/lib
+includedir=${prefix}/include
+
+Name: @TARGET_NAME@
+Description: @PROJECT_DESCRIPTION@
+Version: @PROJECT_VERSION@
+Depends: @DEPS_PKGCONFIG@
+Libs: -L${libdir} -l@TARGET_NAME@
+Cflags: -I${includedir}
+