diff --git a/templates/mc.tmpl b/templates/mc.tmpl
index 8d83aeef4c7..c1c92a012ab 100755
--- a/templates/mc.tmpl
+++ b/templates/mc.tmpl
@@ -7,7 +7,7 @@ build_style=gnu_configure
 # Override datadir to get the correct directory.
 configure_args="--without-ext2undel --with-screen=mcslang
  --enable-charset --without-libiconv-prefix --without-libintl-prefix
- --datadir=$PKGFS_DESTDIR/$pkgname/share"
+ --datadir=$PKGFS_DESTDIR/$pkgname-$version/share"
 
 configure_env="gt_cv_func_gnugettext_libintl=yes
  gt_cv_func_gnugettext1_libintl=yes gt_cv_func_gnugettext2_libintl=yes"
diff --git a/templates/ruby.tmpl b/templates/ruby.tmpl
index 594fd260328..6a19bca886e 100755
--- a/templates/ruby.tmpl
+++ b/templates/ruby.tmpl
@@ -6,7 +6,7 @@ url=ftp://ftp.ruby-lang.org/pub/ruby/1.8
 build_style=gnu_configure
 # Override --exec-prefix to install it into the correct location.
 configure_args="--enable-pthread --enable-shared
- --exec-prefix=$PKGFS_DESTDIR/$pkgname"
+ --exec-prefix=$PKGFS_DESTDIR/$pkgname-$version"
 short_desc="Ruby programming language"
 maintainer="Daniel Horecki <morr@morr.pl>"
 checksum=07bf0d6987ba111aed988093c569fb66ba54891b