diff --git a/PKGBUILD b/PKGBUILD
index 724ec9d..7760d8c 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,16 +1,18 @@
 _name=wisp
 pkgname=guile-$_name-hg
-pkgver=r1623.9b0863aad000
+pkgver=r1623+.9b0863aad000+
 pkgrel=1
-pkgdesc="wisp is a whitespace to lisp converter (srfi-119). guile module"
+pkgdesc="Whitespace to Lisp converter (srfi-119) as a guile module"
 arch=(any)
 license=(gpl3+)
 makedepends=(mercurial)
 depends=("guile>=2")
 provides=("$_name")
-source=("hg+https://bitbucket.org/ArneBab/wisp#branch=stable")
+source=("hg+https://bitbucket.org/ArneBab/wisp#branch=stable"
+        "fix-packaging.patch")
 url="http://www.draketo.de/english/wisp"
-md5sums=(SKIP)
+md5sums=(SKIP
+         SKIP)
 install="$pkgname.install"
 
 pkgver() {
@@ -18,10 +20,19 @@ pkgver() {
   printf "r%s.%s" "$(hg identify -n)" "$(hg identify -i)"
 }
 
+prepare() {
+  cd "$srcdir/$_name"
+  patch -i "${srcdir}/fix-packaging.patch"
+}
+
+build() {
+  cd "$srcdir/$_name"
+  autoreconf -i
+  ./configure --datarootdir=/usr/share
+  make
+}
+
 package() {
-  cd "$srcdir/$_name" &&
-  autoreconf -i &&
-  ./configure --datarootdir=/usr/share &&
-  make &&
+  cd "$srcdir/$_name"
   make install DESTDIR="$pkgdir"
-}
\ No newline at end of file
+}
diff --git a/fix-packaging.patch b/fix-packaging.patch
new file mode 100644
index 0000000..7f88a3c
--- /dev/null
+++ b/fix-packaging.patch
@@ -0,0 +1,19 @@
+--- wisp/Makefile.am.orig	2019-06-04 17:35:29.588335895 -0400
++++ wisp/Makefile.am	2019-06-04 17:32:48.398064596 -0400
+@@ -2,13 +2,13 @@
+ 
+ bin_SCRIPTS = wisp2lisp
+ 
+-sitedir = $(datarootdir)/guile/$(GUILE_EFFECTIVE_VERSION)/site
++sitedir = $(datarootdir)/guile/site/$(GUILE_EFFECTIVE_VERSION)
+ site_DATA = wisp.scm
+ 
+-langdir = $(datarootdir)/guile/$(GUILE_EFFECTIVE_VERSION)/site/language
++langdir = $(datarootdir)/guile/site/$(GUILE_EFFECTIVE_VERSION)/language
+ lang_DATA = language/wisp.scm
+ 
+-langwispdir = $(datarootdir)/guile/$(GUILE_EFFECTIVE_VERSION)/site/language/wisp
++langwispdir = $(datarootdir)/guile/site/$(GUILE_EFFECTIVE_VERSION)/language/wisp
+ langwisp_DATA = language/wisp/spec.scm
+ 
+ WISP = wisp-guile.w wisp-reader.w wisp-scheme.w