diff --git a/Makefile b/Makefile
index 16b5ef41b3..f40863247d 100644
--- a/Makefile
+++ b/Makefile
@@ -291,7 +291,7 @@ export TARGET_DIR
 export STAGING_DIR
 export HOST_DIR
 export BINARIES_DIR
-export BASE_DIR O   # O and BASE_DIR are the same
+export BASE_DIR
 
 #############################################################
 #
diff --git a/docs/manual/customize-rootfs.txt b/docs/manual/customize-rootfs.txt
index 4d3b559706..6399699bdc 100644
--- a/docs/manual/customize-rootfs.txt
+++ b/docs/manual/customize-rootfs.txt
@@ -43,7 +43,7 @@ there are a few ways to customize the resulting target filesystem.
       xref:generic-package-reference[]
     - +BINARIES_DIR+: the place where all binary files (aka images) are
       stored
-    - +BASE_DIR+ (or +O+): the base output directory
+    - +BASE_DIR+: the base output directory
 
 * A special package, 'customize', stored in +package/customize+ can be
   used. You can put all the files that you want to see in the final