diff --git a/poppler-0.16.3-0.bee b/poppler-0.16.3-0.bee
deleted file mode 100755
index 29d346414..000000000
--- a/poppler-0.16.3-0.bee
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/env beesh
-
-SRCURL[0]="http://poppler.freedesktop.org/poppler-${PKGVERSION}.tar.gz"
-
-PATCHURL[0]=""
-
-PGRP=( uncategorized )
-
-
-
-# BEE_CONFIGURE=compat
-
-# EXCLUDE=""
-
-mee_patch() {
-    bee_patch
-}
-
-mee_configure() {
-    bee_configure --enable-xpdf-headers 
-}
-
-mee_build() {
-    bee_build
-}
-
-mee_install() {
-    bee_install
-}
-
diff --git a/poppler-0.20.2_p11_g3ca2bc0-0.x86_64.bee b/poppler-0.20.2_p11_g3ca2bc0-0.x86_64.bee
deleted file mode 100755
index e9682dc0b..000000000
--- a/poppler-0.20.2_p11_g3ca2bc0-0.x86_64.bee
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/env beesh
-
-SRCURL[0]="http://poppler.freedesktop.org/poppler-${PKGVERSION}.tar.gz"
-
-PATCHURL[0]="/src/mariux/download/poppler-0.20.2-11-g3ca2bc0.patch"
-
-BEE_BUILDTYPE=configure
-
-# BEE_CONFIGURE=compat
-
-# EXCLUDE=""
-
-mee_configure() {
-    bee_configure \
-       --enable-xpdf-headers \
-       --enable-cairo-output \
-       --disable-static \
-       --enable-libjpeg \
-       --enable-poppler-qt4 \
-       --disable-zlib \
-       --enable-introspection=yes
-       
-}
diff --git a/poppler.be0 b/poppler.be0
index 35aeaa190..4ecc354cb 100755
--- a/poppler.be0
+++ b/poppler.be0
@@ -1,5 +1,5 @@
 #!/usr/bin/env beesh
-#BEE_VERSION poppler-0.35.0-0
+# BEE_VERSION poppler-0.54.0-0
 
 export CMAKE_PREFIX_PATH=/usr/local/qt5
 
@@ -65,7 +65,7 @@ mee_configure() {
             --disable-static            \
             --enable-build-type=release \
             --enable-cmyk               \
-            --enable-xpdf-headers 
+            --enable-xpdf-headers
 }
 
 #mee_build() {
@@ -76,21 +76,3 @@ mee_configure() {
 #    bee_install
 #}
 ## by default this may be 'make install DESTDIR="${D}"'
-
-###############################################################################
-##
-## Additional hints:
-##
-## The name of this bee-file should follow the following naming convention:
-##     pkgname-pkgversion-pkgrevision.bee
-##
-## You may remove all comments as long as SRCURL[0]="" is set.
-##
-## Everything in this file will be executed in a bash environment.
-##
-## Build the package by executing
-##     './pkg-version-N.bee' or
-##     'beesh ./pkg-version-N.bee'
-##
-## see http://beezinga.org/
-##
diff --git a/poppler_compat.be0 b/poppler_compat.be0
new file mode 100755
index 000000000..1fc8c519b
--- /dev/null
+++ b/poppler_compat.be0
@@ -0,0 +1,38 @@
+#!/usr/bin/env beesh
+# BEE_VERSION poppler_compat-0.54.0-0
+# compatibility package for poppler
+# /project/admin/tools/beediff.pl `bee list poppler|grep -v data` 2>&1 | less
+
+SRCURL=()
+
+mee_install() {
+    cd ${D}
+
+    tar xpf /src/mariux/beeroot/packages/poppler-0.16.3-0.x86_64.bee.tar.bz2 \
+        /usr/lib/girepository-1.0/Poppler-0.16.typelib \
+        /usr/lib/libpoppler-glib.so.6 \
+        /usr/lib/libpoppler-glib.so.6.0.0 \
+        /usr/lib/libpoppler.so.13 \
+        /usr/lib/libpoppler.so.13.0.0 \
+        /usr/share/gir-1.0/Poppler-0.16.gir
+
+#        /usr/bin/pdftoabw \
+#        /usr/share/gtk-doc/html/poppler/poppler.devhelp
+#        /usr/lib/libpoppler.a \
+#        /usr/lib/libpoppler-cpp.a \
+#        /usr/lib/libpoppler-glib.a \
+
+    tar xpf /src/mariux/beeroot/packages/poppler-0.20.2_p11_g3ca2bc0-0.x86_64.bee.tar.bz2 \
+        /usr/lib/libpoppler-glib.so.8.4.0 \
+        /usr/lib/libpoppler-qt4.so.4.0.0 \
+        /usr/lib/libpoppler.so.26 \
+        /usr/lib/libpoppler.so.26.0.0
+
+    tar xpf /src/mariux/beeroot/packages/poppler-0.35.0-0.x86_64.bee.tar.bz2 \
+        /usr/lib/libpoppler-cpp.so.0.2.1 \
+        /usr/lib/libpoppler-glib.so.8.7.0 \
+        /usr/lib/libpoppler-qt4.so.4.7.0 \
+        /usr/lib/libpoppler-qt5.so.1.4.0 \
+        /usr/lib/libpoppler.so.54 \
+        /usr/lib/libpoppler.so.54.0.0
+}
diff --git a/samba-3.5.14-0.bee b/samba.be0
similarity index 100%
rename from samba-3.5.14-0.bee
rename to samba.be0
diff --git a/scripts/cleanup-poppler-xpdf-to-0.54.0.sh b/scripts/cleanup-poppler-xpdf-to-0.54.0.sh
new file mode 100755
index 000000000..b151c1a56
--- /dev/null
+++ b/scripts/cleanup-poppler-xpdf-to-0.54.0.sh
@@ -0,0 +1,7 @@
+#!/bin/bash -x
+bee update xpdf
+bee remove poppler-0.16.3-0.x86_64
+bee remove poppler-0.20.2_p11_g3ca2bc0-0.x86_64
+bee remove poppler-0.35.0-0.x86_64
+bee install poppler
+bee install poppler_compat