diff --git a/data/promoe.1 b/data/promoe.1.in
similarity index 72%
rename from data/promoe.1
rename to data/promoe.1.in
index 7dc1c4a..86bdbc5 100644
--- a/data/promoe.1
+++ b/data/promoe.1.in
@@ -13,8 +13,14 @@ XMMS/WinAMP classic.
 .I $XDG_CONFIG_HOME/xmms2/Promoe.conf
 The configuration file
 .TP
+.I @PROMOE_SKINDIR@
+Default system directory for XMMS skins. Skins that are added in this directory
+are available to all users on a system. This directory is set when the
+application is compiled.
+.TP
 .I $HOME/.config/xmms2/clients/promoe/skins
-Default directory for skins, can be changed in the configuration file
+Default directory for per user skins. This directory can be changed in the
+configuration file
 .SH  ENVIRONMENT VARIABLES
 .TP
 .I XMMS_PATH
diff --git a/data/wscript b/data/wscript
index 3bfe900..0efa1a1 100644
--- a/data/wscript
+++ b/data/wscript
@@ -36,7 +36,9 @@ POSSIBILITY OF SUCH DAMAGE.
 def set_options(opt):
     pass
 def configure(conf):
-    pass
+    conf.check_tool('misc')
+
+
 def build(bld):
     obj              = bld.new_task_gen('qt4', 'cxx')
     obj.target       = 'promoe_data'
@@ -44,6 +46,10 @@ def build(bld):
     obj.source       = 'skins/Almond-blue.qrc'
     obj.uselib       = 'QTCORE'
 
+    man              = bld.new_task_gen('subst')
+    man.source       = 'promoe.1.in'
+    man.install_path = '${MANDIR}/man1'
+
     bld.install_files('${MANDIR}/man1', 'promoe.1')
     bld.install_files('${DATADIR}/applications', 'promoe.desktop')
     bld.install_files('${DATADIR}/icons', 'icons/ashton-flame1/promoe.svg')
diff --git a/wscript b/wscript
index f7eb516..ee8711b 100644
--- a/wscript
+++ b/wscript
@@ -63,7 +63,8 @@ def configure(conf):
 
     conf.define('PROMOE_DATADIR', os.path.join(conf.env['DATADIR'], 'promoe'))
     conf.define('PROMOE_SKINDIR', 
-                os.path.join(conf.env['PROMOE_DATADIR'], 'Skins'))
+                os.path.join(conf.env['PROMOE_DATADIR'], 'skins'))
+
 
     conf.sub_config('lib')
     conf.sub_config('data')