diff --git a/ruby/facter/facter.info b/ruby/facter/facter.info
deleted file mode 100644
index f09e1843db..0000000000
--- a/ruby/facter/facter.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="facter"
-VERSION="1.6.17"
-HOMEPAGE="http://www.puppetlabs.com/puppet/related-projects/facter/"
-DOWNLOAD="http://puppetlabs.com/downloads/facter/facter-1.6.17.tar.gz"
-MD5SUM="7dbefba6148d2c6b6034009c46b3ae14"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Thibaut Notteboom"
-EMAIL="tib@tibux.org"
diff --git a/ruby/facter/README b/system/facter/README
similarity index 100%
rename from ruby/facter/README
rename to system/facter/README
diff --git a/ruby/facter/doinst.sh b/system/facter/doinst.sh
similarity index 100%
rename from ruby/facter/doinst.sh
rename to system/facter/doinst.sh
diff --git a/system/facter/facter-lib64.patch b/system/facter/facter-lib64.patch
new file mode 100644
index 0000000000..5de8537080
--- /dev/null
+++ b/system/facter/facter-lib64.patch
@@ -0,0 +1,11 @@
+--- lib/CMakeLists.txt.orig	2015-06-30 22:48:00.309505706 +0200
++++ lib/CMakeLists.txt	2015-06-30 22:48:28.407734850 +0200
+@@ -238,7 +238,7 @@
+     set(LIBFACTER_INSTALL_DESTINATION bin)
+ else()
+     # TODO: lib64 for certain operating systems?
+-    set(LIBFACTER_INSTALL_DESTINATION lib)
++    set(LIBFACTER_INSTALL_DESTINATION lib64)
+ endif()
+ 
+ if (JRUBY_SUPPORT)
diff --git a/ruby/facter/facter.SlackBuild b/system/facter/facter.SlackBuild
similarity index 84%
rename from ruby/facter/facter.SlackBuild
rename to system/facter/facter.SlackBuild
index 9fbdda570e..2aeae6021f 100644
--- a/ruby/facter/facter.SlackBuild
+++ b/system/facter/facter.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for facter
 
-# Copyright 2012-2013 Thibaut Notteboom, Paris, FRANCE
+# Copyright 2012-2015 Thibaut Notteboom, Paris, FRANCE
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=facter
-VERSION=${VERSION:-1.6.17}
+VERSION=${VERSION:-3.0.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -69,14 +69,28 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-ruby install.rb install --destdir=$PKG
+if [ "$ARCH" = "x86_64" ]; then
+  patch -p0 < $CWD/facter-lib64.patch
+fi
+
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_VERBOSE_MAKEFILE=ON \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make
+  make install DESTDIR=$PKG
+cd ..
+    #-DLIBDIR=lib${LIBDIRSUFFIX} \
+
+mv $PKG/usr/share/man $PKG/usr/man
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-mkdir -p $PKG/etc
-cp -a etc/facter.conf $PKG/etc/facter.conf.new
-
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
@@ -86,7 +100,6 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/facter/facter.info b/system/facter/facter.info
new file mode 100644
index 0000000000..38583b3828
--- /dev/null
+++ b/system/facter/facter.info
@@ -0,0 +1,10 @@
+PRGNAM="facter"
+VERSION="3.0.1"
+HOMEPAGE="https://puppetlabs.com/facter/"
+DOWNLOAD="https://downloads.puppetlabs.com/facter/facter-3.0.1.tar.gz"
+MD5SUM="c5ce03ec246c10a0694dea397c59bc1f"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="yaml-cpp"
+MAINTAINER="Thibaut Notteboom"
+EMAIL="thibaut.notteboom@gmail.com"
diff --git a/ruby/facter/slack-desc b/system/facter/slack-desc
similarity index 92%
rename from ruby/facter/slack-desc
rename to system/facter/slack-desc
index 4107441ae3..3c81230391 100644
--- a/ruby/facter/slack-desc
+++ b/system/facter/slack-desc
@@ -13,7 +13,7 @@ facter: about the hardware and operating system. Facter is especially useful
 facter: for retrieving things like operating system names, hardware
 facter: characteristics, IP addresses, MAC addresses, and SSH keys.
 facter:
-facter: Homepage: http://puppetlabs.com/puppet/related-projects/facter/
+facter: Homepage: https://puppetlabs.com/facter/
 facter:
 facter:
 facter: