diff --git a/bin/xbps-repo/util.c b/bin/xbps-repo/util.c
index e21dce25..3c71ab11 100644
--- a/bin/xbps-repo/util.c
+++ b/bin/xbps-repo/util.c
@@ -106,15 +106,6 @@ show_pkg_info(prop_dictionary_t dict)
 		printf("\n");
 	}
 
-	obj = prop_dictionary_get(dict, "keep_dirs");
-	if (obj && prop_object_type(obj) == PROP_TYPE_ARRAY) {
-		printf("Permanent directories:\n");
-		sep = "  ";
-		(void)xbps_callback_array_iter_in_dict(dict, "keep_dirs",
-		    list_strings_sep_in_array, __UNCONST(sep));
-		printf("\n");
-	}
-
 	obj = prop_dictionary_get(dict, "short_desc");
 	if (obj && prop_object_type(obj) == PROP_TYPE_STRING)
 		printf("Description: %s", prop_string_cstring_nocopy(obj));
diff --git a/lib/depends.c b/lib/depends.c
index dabb5d31..c8ae4721 100644
--- a/lib/depends.c
+++ b/lib/depends.c
@@ -90,7 +90,6 @@ store_dependency(prop_dictionary_t master, prop_dictionary_t depd,
 	 * Remove some unneeded objects.
 	 */
 	prop_dictionary_remove(dict, "conf_files");
-	prop_dictionary_remove(dict, "keep_dirs");
 	prop_dictionary_remove(dict, "maintainer");
 	prop_dictionary_remove(dict, "long_desc");
 
diff --git a/shutils/metadata.sh b/shutils/metadata.sh
index f3fc3350..178397ce 100644
--- a/shutils/metadata.sh
+++ b/shutils/metadata.sh
@@ -57,7 +57,7 @@ xbps_write_metadata_pkg()
 		if [ ! -f $XBPS_TEMPLATESDIR/${sourcepkg}/${subpkg}.template ]; then
 			msg_error "Cannot find subpackage template!"
 		fi
-		unset run_depends conf_files keep_dirs noarch triggers \
+		unset run_depends conf_files noarch triggers \
 			revision openrc_services essential
 		. $XBPS_TEMPLATESDIR/${sourcepkg}/${subpkg}.template
 		pkgname=${sourcepkg}-${subpkg}
@@ -228,13 +228,6 @@ xbps_write_metadata_pkg_real()
 		echo "<dict>" >> $TMPFPLIST
 		echo "<key>file</key>" >> $TMPFPLIST
 		echo "<string>$j</string>" >> $TMPFPLIST
-		for i in ${keep_dirs}; do
-			if [ "$j" = "$i" ]; then
-				echo "<key>keep</key>" >> $TMPFPLIST
-				echo "<true/>" >> $TMPFPLIST
-				break
-			fi
-		done
 		echo "</dict>" >> $TMPFPLIST
 	done
 	echo "</array>" >> $TMPFPLIST
@@ -317,15 +310,6 @@ _EOF
 		done
 		echo "</array>" >> $TMPFPROPS
 	fi
-	# Keep directories while removing.
-	if [ -n "$keep_dirs" ]; then
-		echo "<key>keep_dirs</key>" >> $TMPFPROPS
-		echo "<array>" >> $TMPFPROPS
-		for f in ${keep_dirs}; do
-			echo "<string>$f</string>" >> $TMPFPROPS
-		done
-		echo "</array>" >> $TMPFPROPS
-	fi
 
 	# Terminate the property list file.
 	echo "</dict>" >> $TMPFPROPS
diff --git a/shutils/tmpl_funcs.sh b/shutils/tmpl_funcs.sh
index 8bc106d8..5112aebc 100644
--- a/shutils/tmpl_funcs.sh
+++ b/shutils/tmpl_funcs.sh
@@ -74,7 +74,7 @@ reset_tmpl_vars()
 			sgml_catalogs xml_catalogs xml_entries sgml_entries \
 			build_depends libtool_fixup_la_stage no_fixup_libtool \
 			disable_parallel_build run_depends cross_compiler \
-			only_for_archs conf_files keep_dirs \
+			only_for_archs conf_files \
 			noarch subpackages sourcepkg gtk_iconcache_dirs \
 			abi_depends api_depends triggers openrc_services \
 			libtool_no_delete_archives \