diff --git a/docs/filesystem.md b/docs/filesystem.md
index 38fcc6c..e050997 100644
--- a/docs/filesystem.md
+++ b/docs/filesystem.md
@@ -110,17 +110,3 @@ For the time being, it has been decided to not include multiarch support.
 All packages are built for a single target architecture. This simplifies both
 the build process and the final system as well as reducing the memory footprint
 of the system image.
-
-
-## The srv and opt directories
-
-A `/srv` directory is included in the filesystem to store static service files
-such as web sites served by a web server. The intention is to have those files
-backed into the squashfs image.
-
-If custom applications are built and bundled into the filesystem, it is
-strongly encouraged to use the standard locations for those. However, if it is
-desired for some reason, a `/opt` directory is also added by default. The
-contents of the `PATH` variable and the configuration file of the loader may
-have to be adjusted.
-
diff --git a/pkg/rootfs/build b/pkg/rootfs/build
index 1695d01..c501d0f 100755
--- a/pkg/rootfs/build
+++ b/pkg/rootfs/build
@@ -6,7 +6,7 @@ build() {
 
 	# setup skeleton
 	mkdir -pv ${PKGBUILDDIR}/{bin,lib,etc,dev,sys,proc,tmp,var,run}
-	mkdir -pv ${PKGBUILDDIR}/{boot,usr,srv,mnt,opt}
+	mkdir -pv ${PKGBUILDDIR}/{boot,usr,mnt}
 	mkdir -pv ${PKGBUILDDIR}/cfg/{preserve,overlay}
 
 	cp -r "$SCRIPTDIR/pkg/$PKGNAME/etc" "$PKGBUILDDIR"