diff --git a/FileRunner-2.5.1p3-0.bee b/FileRunner-2.5.1p3-0.bee
deleted file mode 100755
index 501cdf1dd..000000000
--- a/FileRunner-2.5.1p3-0.bee
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/usr/bin/env beesh
-
-SRCURL[0]="/src/mariux/download/FileRunner-${PKGVERSION}.tar.gz"
-
-PATCHURL[0]=""
-
-# BEE_CONFIGURE=compat
-
-# BEE_BUILDTYPE=
-
-# EXCLUDE=""
-
-# build_in_sourcedir
-
-
-
-#mee_extract() {
-#    bee_extract ${@}
-#}
-
-mee_patch() {
-  perl -pix -e  's/wish8\.4/wish/g' fr
-  for i in frcolor frftp; do
-    perl -pix -e  's/wish8\.0/wish/g' $i
-  done
-}
-
-#mee_configure() {
-#    bee_configure 
-#}
-
-#mee_build() {
-#    bee_build
-#}
-
-mee_install() {
-  mkdir -p $D/usr/lib/fr/bitmaps
-  chmod 755 $D/usr/lib/fr
-  chmod 755 $D/usr/lib/fr/bitmaps
-
-  for i in fr frcolor frftp ext.so; do
-    cp $i $D/usr/lib/fr
-    chmod 755 $D/usr/lib/fr/$i  
-  done
-
-  mkdir -p $D/usr/bin
-  ln -fs /usr/lib/fr/fr $D/usr/bin/fr
-
-  for i in chmod.tcl cmd.tcl config.tcl dialog.tcl font.tcl ftp.tcl http.tcl menu_80_patch.tcl fr.gif so_locations tclIndex bitmaps/*; do
-    cp $i $D/usr/lib/fr/$i
-    chmod 644 $D/usr/lib/fr/$i
-  done
-
-  for i in QuickStart.txt Users_Guide.txt Tips.txt FAQ README HISTORY KnownBugs.txt COPYING; do
-    cp $i $D/usr/lib/fr/$i
-    chmod 644 $D/usr/lib/fr/$i
-  done
-
-}
diff --git a/FileRunner.be0 b/FileRunner.be0
new file mode 100755
index 000000000..47b49960b
--- /dev/null
+++ b/FileRunner.be0
@@ -0,0 +1,99 @@
+#!/usr/bin/env beesh
+
+# BEE_VERSION FileRunner-17.04.01.19-0
+
+SRCURL[0]="https://sourceforge.net/projects/filerunner/files/release-${PKGVERSION}/fr-${PKGVERSION}.tar.gz/download fr-${PKGVERSION}.tar.gz"
+
+PATCHURL[0]=""
+
+build_in_sourcedir
+
+#mee_extract() {
+#    bee_extract ${@}
+#}
+
+#mee_configure() {
+#    bee_configure 
+#}
+
+mee_build() {
+  (
+  cd Makefiles
+  tar xf tcl-inotify-1.4.1.tar.gz
+  cd tcl-inotify-1.4.1
+  ./configure
+  make
+  )
+
+  echo 'set ::glob(doclib_fr) /usr/share/filerunner/doc' > config
+  echo 'if {[file readable /usr/share/config/filerunnerrc]}  {source /usr/share/config/filerunnerrc}' >> config
+}
+
+mee_install() {
+
+  DS=${D}/usr/share/filerunner
+
+  mkdir -p -m 755 ${DS}/usr/share/filerunner
+  mkdir -p $D/usr/bin
+
+  ln -fs ../share/filerunner/fr $D/usr/bin/fr
+
+  for i in *.tcl config tclIndex; do
+    cp -v $i ${DS}/$i
+    chmod 644 ${DS}/$i
+  done
+
+  mkdir -p -m 755 ${DS}/frlib
+  for i in frlib/*.tcl; do
+    cp -v $i  ${DS}/$i
+    chmod 644 ${DS}/$i
+  done
+
+  for i in fr frftp ; do
+    cp -v $i ${DS}/$i
+    chmod 755 ${DS}/$i
+  done
+
+  mkdir -p -m 755 ${DS}/packages
+  for p in expect ftp log tkcon; do
+    mkdir -p -m 755 ${DS}/packages/$p
+    cp -v packages/$p/*.tcl  ${DS}/packages/$p/
+    chmod 644 ${DS}/packages/$p/*.tcl
+  done
+
+  mkdir -p -m 755 ${DS}/packages/inotify/x86_64
+  cp -v Makefiles/tcl-inotify-1.4.1/{libinotify1.4.1.so,pkgIndex.tcl} ${DS}/packages/inotify/
+  chmod 644 ${DS}/packages/inotify/*.tcl
+  chmod 755 ${DS}/packages/inotify/*.so
+
+  mkdir -p -m 755 ${D}/usr/share/applications
+  for i in filerunner.desktop; do
+    cp -v Makefiles/$i ${D}/usr/share/applications/$i
+    chmod 644          ${D}/usr/share/applications/$i
+  done
+
+  for i in icons/filerunner*.png; do
+    subdir=${i#icons/filerunner-}
+    subdir=${subdir%.png}
+    mkdir -p -m 755 ${D}/usr/share/icons/hicolor/${subdir}/apps
+    cp -v $i        ${D}/usr/share/icons/hicolor/${subdir}/apps/filerunner.png
+    chmod 444       ${D}/usr/share/icons/hicolor/${subdir}/apps/filerunner.png
+  done
+
+  for i in filerunner.desktop; do
+    cp -v Makefiles/$i ${D}/usr/share/applications/$i
+    chmod 644          ${D}/usr/share/applications/$i
+  done
+
+  mkdir -p -m 755 ${DS}/bitmaps
+  for i in bitmaps/*.bit; do
+    cp -v $i  ${DS}/$i
+    chmod 444 ${DS}/$i
+  done
+
+  mkdir -p -m 755 ${DS}/doc
+  for i in doc/*; do
+    cp -v $i  ${DS}/$i
+    chmod 444 ${DS}/$i
+  done
+}