diff --git a/CMakeLists.txt b/CMakeLists.txt
index af1afc0..f2aada2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -247,6 +247,5 @@ install( FILES default_icon.png DESTINATION ${DATADIR}/tint2 )
 install( FILES AUTHORS ChangeLog README.md DESTINATION ${DOCDIR} )
 install( FILES doc/tint2.1 DESTINATION ${MANDIR}/man1 )
 if( ENABLE_EXTRA_THEMES )
-  file( GLOB EXTRATHEMEFILES themes/*.tint2rc )
-  install( FILES ${EXTRATHEMEFILES} DESTINATION ${DATADIR}/tint2 )
-endif( ENABLE_EXAMPLES )
+  add_subdirectory(themes)
+endif( ENABLE_EXTRA_THEMES )
diff --git a/packaging/ubuntu/tint2.install b/packaging/ubuntu/tint2.install
index 48ced1e..bd0dfa0 100644
--- a/packaging/ubuntu/tint2.install
+++ b/packaging/ubuntu/tint2.install
@@ -9,4 +9,4 @@
 /usr/share/icons/hicolor/scalable/apps/tint2.svg
 /usr/share/icons/hicolor/scalable/apps/tint2conf.svg
 /usr/share/locale/*
-/usr/share/tint2/default_icon.png
+/usr/share/tint2/*
diff --git a/themes/CMakeLists.txt b/themes/CMakeLists.txt
new file mode 100644
index 0000000..5d78457
--- /dev/null
+++ b/themes/CMakeLists.txt
@@ -0,0 +1,2 @@
+file( GLOB EXTRATHEMEFILES *.tint2rc )
+install( FILES ${EXTRATHEMEFILES} DESTINATION ${DATADIR}/tint2 )
diff --git a/tint2.files b/tint2.files
index c50f911..ad58217 100644
--- a/tint2.files
+++ b/tint2.files
@@ -179,3 +179,4 @@ tint2.svg
 src/tint2conf/po/ru.po
 src/util/cache.c
 src/util/cache.h
+themes/CMakeLists.txt
diff --git a/tint2.includes b/tint2.includes
index cdfa141..16187c2 100644
--- a/tint2.includes
+++ b/tint2.includes
@@ -21,3 +21,4 @@ po
 src/tint2conf/po
 src/freespace
 src/execplugin
+themes