diff --git a/x11-wm/afterstep-stable/files/patch-afterstep::Makefile.in b/x11-wm/afterstep-stable/files/patch-afterstep::Makefile.in
new file mode 100644
index 000000000000..0de164cfdcd1
--- /dev/null
+++ b/x11-wm/afterstep-stable/files/patch-afterstep::Makefile.in
@@ -0,0 +1,25 @@
+$FreeBSD$
+
+--- afterstep/Makefile.in.orig	Tue Jul 10 22:25:39 2007
++++ afterstep/Makefile.in	Tue Jul 10 22:26:53 2007
+@@ -29,19 +29,7 @@
+ 		fi
+ 
+ install.data_reinstall:		remove_old
+-	@$(RMF) no_data_reinstall ; \
+-	if [ -d $(AFTER_SHAREDIR) ] ; then \
+-	   echo $(MV) $(AFTER_SHAREDIR) $(AFTER_SHAREDIR)_old; \
+-	   $(MV) $(AFTER_SHAREDIR) $(AFTER_SHAREDIR)_old; \
+-	   if [ -d $(AFTER_SHAREDIR)_old/desktop -a -d $(AFTER_SHAREDIR)_old/desktop/tiles  ] ; then \
+-		no_data_reinstall=$(NO_DATA_REINSTALL); \
+-	   fi; \
+-	   if [ -n "$$no_data_reinstall" ]; then \
+-		touch no_data_reinstall; \
+-	   fi; \
+-	 else \
+-	   echo "no previous installation detected"; \
+-	 fi
++	@$(RMF) no_data_reinstall
+ 
+ share_dirs: 
+ 	 $(MKDIR) -p $(AFTER_SHAREDIR)
diff --git a/x11-wm/afterstep-stable/pkg-plist b/x11-wm/afterstep-stable/pkg-plist
index fb8820bd980a..56c54a4e7f59 100644
--- a/x11-wm/afterstep-stable/pkg-plist
+++ b/x11-wm/afterstep-stable/pkg-plist
@@ -1366,7 +1366,6 @@ lib/libAfterStep.a
 share/xsessions/AfterStep.desktop
 @dirrm share/xsessions
 @dirrm share/pixmaps
-@dirrm %%DATADIR%%_old
 @dirrm %%DATADIR%%/themes
 @dirrm %%DATADIR%%/start/7_About_AfterStep
 @dirrm %%DATADIR%%/start/5_Quit