diff --git a/font-util-1.3.0-0.bee b/font-util.be0
similarity index 94%
rename from font-util-1.3.0-0.bee
rename to font-util.be0
index 2dc9587a0..a10b54eb2 100755
--- a/font-util-1.3.0-0.bee
+++ b/font-util.be0
@@ -1,5 +1,7 @@
 #!/usr/bin/env beesh
 
+# BEE_VERSION font-util-1.3.1-0
+
 ## this file was created by bee init and should be executed to build a
 ## bee-package. (Additional hints are located at the end of this file.)
 
@@ -7,7 +9,7 @@
 ## The source URL(s) define the location of the sources that will be
 ## downloaded. Version variables may be used to simplify reuse of this bee-file.
 
-SRCURL[0]="http://xorg.freedesktop.org/releases/individual/font/font-util-${PKGVERSION}.tar.bz2"
+SRCURL[0]="https://www.x.org/releases/individual/font/font-util-${PKGVERSION}.tar.bz2"
 
 ###############################################################################
 ## Add URLs/pathes to patch files to the PATCHURL array.
@@ -52,7 +54,7 @@ SRCURL[0]="http://xorg.freedesktop.org/releases/individual/font/font-util-${PKGV
 #}
 
 #mee_configure() {
-#    bee_configure 
+#    bee_configure
 #}
 
 #mee_build() {
diff --git a/libXfont-1.4.7-0.bee b/libXfont2.be0
similarity index 87%
rename from libXfont-1.4.7-0.bee
rename to libXfont2.be0
index c657298c9..eecfa57ff 100755
--- a/libXfont-1.4.7-0.bee
+++ b/libXfont2.be0
@@ -1,5 +1,7 @@
 #!/usr/bin/env beesh
 
+# BEE_VERSION libXfont2-2.0.1-0
+
 ## this file was created by bee init and should be executed to build a
 ## bee-package. (Additional hints are located at the end of this file.)
 
@@ -7,7 +9,7 @@
 ## The source URL(s) define the location of the sources that will be
 ## downloaded. Version variables may be used to simplify reuse of this bee-file.
 
-SRCURL[0]="http://xorg.freedesktop.org/releases/individual/lib/libXfont-${PKGVERSION}.tar.bz2"
+SRCURL[0]="https://www.x.org/releases/individual/lib/libXfont2-${PKGVERSION}.tar.bz2"
 
 ###############################################################################
 ## Add URLs/pathes to patch files to the PATCHURL array.
@@ -22,8 +24,8 @@ SRCURL[0]="http://xorg.freedesktop.org/releases/individual/lib/libXfont-${PKGVER
 # EXCLUDE+=()
 
 ###############################################################################
-## Uncomment the next statement, if the software may not be able to be build
-## outside the source directory and need to be build inside the source
+## Uncomment the next statement, if the software may not be able to be built
+## outside the source directory and needs to be built inside the source
 ## directory.
 
 # build_in_sourcedir
@@ -52,7 +54,9 @@ SRCURL[0]="http://xorg.freedesktop.org/releases/individual/lib/libXfont-${PKGVER
 #}
 
 mee_configure() {
-    bee_configure --disable-devel-docs
+    bee_configure \
+        --disable-devel-docs \
+        --disable-static
 }
 
 #mee_build() {
@@ -71,7 +75,7 @@ mee_configure() {
 ## 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.
+## You may remove all comments as long as SRCURL[0] is set.
 ##
 ## Everything in this file will be executed in a bash environment.
 ##
diff --git a/libevdev-1.5.2-0.bee b/libevdev.be0
similarity index 98%
rename from libevdev-1.5.2-0.bee
rename to libevdev.be0
index 1a7c67a0b..6c320b57f 100755
--- a/libevdev-1.5.2-0.bee
+++ b/libevdev.be0
@@ -1,5 +1,7 @@
 #!/usr/bin/env beesh
 
+# BEE_VERSION libevdev-1.5.6-0
+
 ## this file was created by bee init and should be executed to build a
 ## bee-package. (Additional hints are located at the end of this file.)
 
diff --git a/scripts/update-xorg-server-from-1.18.4-to-1.19.3.sh b/scripts/update-xorg-server-from-1.18.4-to-1.19.3.sh
new file mode 100755
index 000000000..e5b8e5184
--- /dev/null
+++ b/scripts/update-xorg-server-from-1.18.4-to-1.19.3.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+bee update xproto
+bee update font-util
+bee remove bdftopcf-1.0.4-0.x86_64
+bee remove libXfont-1.4.7-0.x86_64
+bee install libXfont2
+bee update xorg-server
+bee update libevdev
+bee update xf86-input-evdev
diff --git a/xf86-input-evdev.be0 b/xf86-input-evdev.be0
index 174474ed2..b6612c962 100755
--- a/xf86-input-evdev.be0
+++ b/xf86-input-evdev.be0
@@ -1,6 +1,6 @@
 #!/usr/bin/env beesh
 
-# BEE_VERSION xf86-input-evdev-2.10.3-0
+# BEE_VERSION xf86-input-evdev-2.10.5-0
 
 ## this file was created by bee init and should be executed to build a
 ## bee-package. (Additional hints are located at the end of this file.)
@@ -9,7 +9,7 @@
 ## The source URL(s) define the location of the sources that will be
 ## downloaded. Version variables may be used to simplify reuse of this bee-file.
 
-SRCURL[0]="http://ftp.x.org/pub/individual/driver/xf86-input-evdev-${PKGVERSION}.tar.bz2"
+SRCURL[0]="https://www.x.org/releases/individual/driver/xf86-input-evdev-${PKGVERSION}.tar.bz2"
 
 ###############################################################################
 ## Add URLs/pathes to patch files to the PATCHURL array.
diff --git a/xorg-server.be0 b/xorg-server.be0
index dc211cc59..b2946e37c 100755
--- a/xorg-server.be0
+++ b/xorg-server.be0
@@ -1,6 +1,6 @@
 #!/usr/bin/env beesh
 
-# BEE_VERSION xorg-server-1.18.4-0
+# BEE_VERSION xorg-server-1.19.3-0
 
 ## this file was created by bee init and should be executed to build a
 ## bee-package. (Additional hints are located at the end of this file.)
@@ -17,7 +17,7 @@ SRCURL[0]="https://ftp.x.org/pub/individual/xserver/xorg-server-${PKGVERSION}.ta
 
 # PATCHURL[0]="/src/mariux/download/xorg-xinerama.patch"
 
-PATCHURL+=(http://www.linuxfromscratch.org/patches/blfs/svn/xorg-server-1.18.4-add_prime_support-1.patch)
+PATCHURL+=(http://www.linuxfromscratch.org/patches/blfs/svn/xorg-server-1.19.3-add_prime_support-1.patch)
 
 ###############################################################################
 ## Add filename patterns to the EXCLUDE array of files that should not
diff --git a/xproto-7.0.28-0.bee b/xproto-7.0.28-0.bee
deleted file mode 100755
index 4b2749b2c..000000000
--- a/xproto-7.0.28-0.bee
+++ /dev/null
@@ -1,83 +0,0 @@
-#!/usr/bin/env beesh
-
-## this file was created by bee init and should be executed to build a
-## bee-package. (Additional hints are located at the end of this file.)
-
-###############################################################################
-## The source URL(s) define the location of the sources that will be
-## downloaded. Version variables may be used to simplify reuse of this bee-file.
-
-SRCURL[0]="http://xorg.freedesktop.org/releases/individual/proto/xproto-${PKGVERSION}.tar.bz2"
-
-###############################################################################
-## Add URLs/pathes to patch files to the PATCHURL array.
-## The sources will be patched in the order of the array.
-
-# PATCHURL+=()
-
-###############################################################################
-## Add filename patterns to the EXCLUDE array of files that should not
-## be added to you package but may be present in the image directory.
-
-# EXCLUDE+=()
-
-###############################################################################
-## Uncomment the next statement, if the software may not be able to be build
-## outside the source directory and need to be build inside the source
-## directory.
-
-# build_in_sourcedir
-
-###############################################################################
-## bee cannot detect buildtypes specified in subdirectories.
-## Sometimes packages "hide" the real sources in a subdirectory named
-## 'src' or 'cmake' or ..
-## use 'sourcesubdir_append' to specify this directory if known.
-
-# sourcesubdir_append src
-
-
-###############################################################################
-## Change the default (auto-detected) steps to
-## extract, patch, configure/setup, build and install the software.
-## Make sure the mee_install function does install everything to the
-## image directory "${D}"
-
-#mee_extract() {
-#    bee_extract "${@}"
-#}
-
-#mee_patch() {
-#    bee_patch "${@}"
-#}
-
-#mee_configure() {
-#    bee_configure 
-#}
-
-#mee_build() {
-#    bee_build
-#}
-
-#mee_install() {
-#    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/bdftopcf-1.0.4-0.bee b/xproto.be0
similarity index 94%
rename from bdftopcf-1.0.4-0.bee
rename to xproto.be0
index 3697664ba..68d9869ed 100755
--- a/bdftopcf-1.0.4-0.bee
+++ b/xproto.be0
@@ -1,5 +1,7 @@
 #!/usr/bin/env beesh
 
+# BEE_VERSION xproto-7.0.31-0
+
 ## this file was created by bee init and should be executed to build a
 ## bee-package. (Additional hints are located at the end of this file.)
 
@@ -7,7 +9,7 @@
 ## The source URL(s) define the location of the sources that will be
 ## downloaded. Version variables may be used to simplify reuse of this bee-file.
 
-SRCURL[0]="http://xorg.freedesktop.org/releases/individual/app/bdftopcf-${PKGVERSION}.tar.bz2"
+SRCURL[0]="https://www.x.org/releases/individual/proto/xproto-${PKGVERSION}.tar.bz2"
 
 ###############################################################################
 ## Add URLs/pathes to patch files to the PATCHURL array.
@@ -52,7 +54,7 @@ SRCURL[0]="http://xorg.freedesktop.org/releases/individual/app/bdftopcf-${PKGVER
 #}
 
 #mee_configure() {
-#    bee_configure 
+#    bee_configure
 #}
 
 #mee_build() {