diff --git a/freecad/PKGBUILD b/freecad/PKGBUILD
index 782ded770..232d4664d 100644
--- a/freecad/PKGBUILD
+++ b/freecad/PKGBUILD
@@ -1,7 +1,7 @@
 pkgname=freecad
 _pkgname=FreeCAD
 pkgver=0.16
-pkgrel=2
+pkgrel=4
 pkgdesc='A general purpose 3D CAD modeler'
 arch=('x86_64')
 url='http://www.freecadweb.org/wiki'
@@ -10,14 +10,14 @@ depends=('boost-libs' 'curl' 'opencascade' 'pivy-hg' 'xerces-c' 'libspnav' 'shar
 makedepends=('boost' 'eigen3' 'gcc-fortran' 'swig' 'xerces-c' 'desktop-file-utils' 'cmake' 'coin' 'zlib' 'glu')
 options=(!libtool !makeflags)
 install=freecad.install
-source=("https://github.com/FreeCAD/FreeCAD/archive/${pkgver}.tar.gz"
+source=("freecad::git+https://github.com/${_pkgname}/${_pkgname}.git#branch=releases/${_pkgname}-${pkgver//./-}"
 	"${pkgname}.desktop"
 	"${pkgname}.xml")
-sha512sums=('bc9dc8122cabd9a84f2b955746818e0d77ae90e68747ec96521099472b7803df9ff794ed823d6eb29352bd0538b8f01cf81c306ff427f1af2ee049f8f7096dbb'
+sha512sums=('SKIP'
             'a58dd5f6d8217b6633d5cc24a0b61954b1044d4156b25b78c00ea29f3ac9ca4932e9bde08bd11fc4327d76c7e82500cf3c2ddc934f426e970757cd200b070aec'
             'ac0dfe1b2c58335867e94d4ce86696763b6354dcdca68a653bf115b6ea562f0f8ff7d243d42d0c6fd6e758bd488d626e30cd917bb1b5c676c1f0cafdece005d6')
 prepare() {
-  cd "${srcdir}/FreeCAD-${pkgver}/"
+  cd "${srcdir}/${pkgname}"
 
   sed -i \
     -e "46i\\\tModDir = '/usr/share/freecad/Mod'" \
@@ -25,12 +25,14 @@ prepare() {
     src/App/FreeCADInit.py
 
   # http://www.freecadweb.org/tracker/view.php?id=2347
-  sed -i 's/boost::re_detail/boost::BOOST_REGEX_DETAIL_NS/' \
-    src/Mod/Drawing/App/FeaturePage.cpp
+  #sed -i 's/boost::re_detail/boost::BOOST_REGEX_DETAIL_NS/' \
+  #  src/Mod/Drawing/App/FeaturePage.cpp
 }
 build() {
-  cd "${srcdir}/${_pkgname}-${pkgver}/"
-  cmake \
+  cd "${srcdir}/${pkgname}"
+  mkdir -p build
+  cd build
+  cmake .. \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX:PATH="/usr" \
     -DCMAKE_INSTALL_DOCDIR:PATH="share/freecad/doc" \
@@ -43,7 +45,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
+  cd "${srcdir}/${pkgname}/build/"
   make DESTDIR="${pkgdir}" install
 
   # Symlink to /usr/bin
diff --git a/rrdtool/PKGBUILD b/rrdtool/PKGBUILD
new file mode 100644
index 000000000..fd7b6b725
--- /dev/null
+++ b/rrdtool/PKGBUILD
@@ -0,0 +1,44 @@
+# Maintainer: Neophytos Kolokotronis <tetris4@gmail.com>
+# Contributors from Arch: Eric Belanger <eric@archlinux.org>
+#                         Tom K <tom@archlinux.org>
+
+pkgname=rrdtool
+pkgver=1.6.0
+pkgrel=2
+pkgdesc="Data logging and graphing application"
+arch=('x86_64')
+url="http://www.rrdtool.org"
+license=('GPL')
+depends=('libpng' 'libxml2' 'pango')
+makedepends=('intltool' 'ruby' 'python2' 'tcl' 'lua' 'groff')
+optdepends=('tcl: to use corresponding binding' \
+            'python2: to use corresponding binding' \
+            'ruby: to use corresponding binding' \
+            'lua: to use corresponding binding')
+options=('!makeflags')
+source=("http://oss.oetiker.ch/rrdtool/pub/${pkgname}-${pkgver}.tar.gz")
+sha1sums=('9866b41bda9416188f236d61d24f185b173fd571')
+
+prepare() {
+  cd ${pkgname}-${pkgver}
+  # fix FS#28521 make ruby install to vendor_ruby instead of site_ruby
+  sed -e 's/$(RUBY) ${abs_srcdir}\/ruby\/extconf.rb/& --vendor/' -i bindings/Makefile.am
+  aclocal
+  automake
+}
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr --localstatedir=/var --disable-rpath \
+    --enable-perl --enable-perl-site-install --with-perl-options='INSTALLDIRS=vendor' \
+    --enable-ruby --enable-ruby-site-install --enable-python \
+    --enable-lua --enable-lua-site-install \
+    --enable-tcl --disable-libwrap
+  make LIBS+="-lglib-2.0"
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" includedir=/usr/include install
+  install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}