diff --git a/packages/twm.rb b/packages/twm.rb
new file mode 100644
index 000000000..660da9190
--- /dev/null
+++ b/packages/twm.rb
@@ -0,0 +1,25 @@
+require 'package'
+
+class Twm < Package
+  description 'The twm package contains a very minimal window manager.'
+  homepage 'http://www.linuxfromscratch.org/blfs/view/svn/x/twm.html'
+  version '1.0.10'
+  source_url 'https://www.x.org/pub/individual/app/twm-1.0.10.tar.bz2'
+  source_sha256 '6449eadca16ce0f0d900605b0cc020b95f40619261b7beccfb46bcc1836445d7'
+
+  binary_url ({
+  })
+  binary_sha256 ({
+  })
+
+  depends_on 'xorg_server'
+
+  def self.build
+    system "./configure", "--prefix=#{CREW_PREFIX}", "--libdir=#{CREW_LIB_PREFIX}"
+    system 'make'
+  end
+
+  def self.install
+    system "make", "DESTDIR=#{CREW_DEST_DIR}", "install"
+  end
+end
diff --git a/packages/xauth.rb b/packages/xauth.rb
new file mode 100644
index 000000000..18a3fceff
--- /dev/null
+++ b/packages/xauth.rb
@@ -0,0 +1,31 @@
+require 'package'
+
+class Xauth < Package
+  description 'X authority file utility'
+  homepage 'https://www.x.org/archive/X11R6.8.1/doc/xauth.1.html'
+  version '1.0.10'
+  source_url 'https://www.x.org/releases/individual/app/xauth-1.0.10.tar.bz2'
+  source_sha256 '5afe42ce3cdf4f60520d1658d2b17face45c74050f39af45dccdc95e73fafc4d'
+
+  binary_url ({
+  })
+  binary_sha256 ({
+  })
+
+  depends_on 'xorg_lib'
+
+  def self.build
+    system "./configure",
+           "--enable-ipv6",
+           "--enable-tcp-transport",
+           "--enable-unix-transport",
+           "--prefix=#{CREW_PREFIX}",
+           "--enable-local-transport",
+           "--libdir=#{CREW_LIB_PREFIX}"
+    system 'make'
+  end
+
+  def self.install
+    system "make", "DESTDIR=#{CREW_DEST_DIR}", "install"
+  end
+end
diff --git a/packages/xclock.rb b/packages/xclock.rb
new file mode 100644
index 000000000..23bb212a2
--- /dev/null
+++ b/packages/xclock.rb
@@ -0,0 +1,25 @@
+require 'package'
+
+class Xclock < Package
+  description 'The xclock package contains a simple clock application which is used in the default xinit configuration.'
+  homepage 'https://www.x.org/archive/X11R6.8.1/doc/xclock.1.html'
+  version '1.0.7'
+  source_url 'https://www.x.org/pub/individual/app/xclock-1.0.7.tar.bz2'
+  source_sha256 '23ceeca94e3e20a6c26a703ac7f789066d4517f8d2cb717ae7cb28a617d97dd0'
+
+  binary_url ({
+  })
+  binary_sha256 ({
+  })
+
+  depends_on 'xorg_lib'
+
+  def self.build
+    system "./configure", "--prefix=#{CREW_PREFIX}", "--libdir=#{CREW_LIB_PREFIX}"
+    system 'make'
+  end
+
+  def self.install
+    system "make", "DESTDIR=#{CREW_DEST_DIR}", "install"
+  end
+end
diff --git a/packages/xinit.rb b/packages/xinit.rb
index 6c527aa50..720b114f6 100644
--- a/packages/xinit.rb
+++ b/packages/xinit.rb
@@ -1,31 +1,27 @@
 require 'package'
 
 class Xinit < Package
-  description 'The xinit package contains a usable script to start the xserver'
+  description 'The xinit package contains a usable script to start the xserver.'
   homepage 'https://www.x.org'
-  version '1.4.0'
+  version '1.4.0-1'
   source_url 'https://x.org/pub/individual/app/xinit-1.4.0.tar.bz2'
   source_sha256 '230835eef2f5978a1e1344928168119373f6df1d0a32c09515e545721ee582ef'
 
   binary_url ({
-    aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/xinit-1.4.0-chromeos-armv7l.tar.xz',
-     armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/xinit-1.4.0-chromeos-armv7l.tar.xz',
-       i686: 'https://dl.bintray.com/chromebrew/chromebrew/xinit-1.4.0-chromeos-i686.tar.xz',
-     x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/xinit-1.4.0-chromeos-x86_64.tar.xz',
   })
   binary_sha256 ({
-    aarch64: '9da0b7a068bd70a97330d1ce90ca457a1554443c0425e4bb27451575ad5d75c4',
-     armv7l: '9da0b7a068bd70a97330d1ce90ca457a1554443c0425e4bb27451575ad5d75c4',
-       i686: '2c12d81cfe8596cafb010e28a1c37ba1692d52889b78de59c43a91a3bf55f153',
-     x86_64: '5df3455157f222c07641d3ff605ff9365fbf4a19d014c2db09999bf84d128296',
   })
 
-  depends_on 'xorg_lib'
+  depends_on 'xclock'
+  depends_on 'xterm'
+  depends_on 'xauth'
+  depends_on 'twm'
+  depends_on 'xwayland'
 
   def self.build
-    system "./configure \
-            --prefix=#{CREW_PREFIX} \
-            --libdir=#{CREW_LIB_PREFIX}"
+    system "./configure",
+           "--prefix=#{CREW_PREFIX}",
+           "--libdir=#{CREW_LIB_PREFIX}"
     system "make"
   end