diff --git a/am-utils-6.1.5-3.x86_64.bee b/am-utils-6.1.5-3.x86_64.bee
deleted file mode 100755
index fdc66501b..000000000
--- a/am-utils-6.1.5-3.x86_64.bee
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/env beesh
-
-PGRP=( uncategorized )
-
-SRCURL[0]="ftp://ftp.am-utils.org/pub/am-utils/am-utils-6.1.5.tar.gz"
-
-PATCHURL+=("/src/mariux/download/am-utils-6.1.5-linux-kernel-version.patch")
-PATCHURL+=("/src/mariux/download/am-utils-6.1.5-mk-amd-map_tmpfile.patch")
-PATCHURL+=("/src/mariux/download/am-utils-6.1.5-nfs-mount-version.patch")
-PATCHURL+=("/src/mariux/download/am-utils-6.1.5-nolock-toplvl.patch")
-PATCHURL+=("/src/mariux/download/am-utils-6.1.5-mariux-nfs_mount_version.patch")
-PATCHURL+=("/src/mariux/download/am-utils-6.1.5-mariux-nfs_mnttab.patch")
-
-BEE_CONFIGURE="compat"
-
-mee_configure() {
-    bee_configure --enable-debug
-}
diff --git a/scripts/update-nfs-utils.sh b/scripts/update-nfs-utils.sh
index 1ba6b462d..746f54ae6 100755
--- a/scripts/update-nfs-utils.sh
+++ b/scripts/update-nfs-utils.sh
@@ -15,6 +15,14 @@ bee install keyutils-1.5.11-0.x86_64
 bee install libtirpc-1.1.4-0.x86_64
 bee update nfs-utils-2.3.3-0.x86_64
 
+# remove amd
+#
+# The service file is currently neither installed with bee nor
+# part of mxtools, so just remove it.
+#
+bee remove am-utils-6.1.5-3.x86_64
+rm /etc/systemd/system/amd.service
+
 # Remove statd.service
 # This service is not required for nfsv4
 # The service file is currently neither installed with bee nor