diff --git a/graphics/stamp/Makefile b/graphics/stamp/Makefile
index bd6c6276ffda..bea7a91b34a9 100644
--- a/graphics/stamp/Makefile
+++ b/graphics/stamp/Makefile
@@ -17,6 +17,7 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib
 
 OPTIONS_DEFINE=	X11
+OPTIONS_SUB=	yes
 X11_USE=	GNOME=gtk12
 
 post-patch:
diff --git a/graphics/stamp/pkg-plist b/graphics/stamp/pkg-plist
index 0f3a32b00699..7840bfcda1c8 100644
--- a/graphics/stamp/pkg-plist
+++ b/graphics/stamp/pkg-plist
@@ -1,5 +1,5 @@
 bin/stamp
-bin/gstamp
+%%X11%%bin/gstamp
 share/stamp/fonts/8x10.fnt
 share/stamp/fonts/8x11snsf.fnt
 share/stamp/fonts/8x14.fnt
@@ -79,15 +79,15 @@ share/stamp/fonts/t.fnt
 share/stamp/fonts/tekton.fnt
 share/stamp/fonts/thai.fnt
 share/stamp/fonts/thin.fnt
-share/stamp/pixmaps/file.xpm
-share/stamp/pixmaps/gstmpcfg.xpm
-share/stamp/pixmaps/gtkstamp.xpm
-share/stamp/pixmaps/stamp.tif
-share/stamp/pixmaps/stamp.xpm
-share/stamp/pixmaps/stamp_not_working.xpm
-share/stamp/pixmaps/stamp_working.xpm
-share/stamp/pixmaps/transfer_not_working.xpm
-share/stamp/pixmaps/transfer_working.xpm
+%%X11%%share/stamp/pixmaps/file.xpm
+%%X11%%share/stamp/pixmaps/gstmpcfg.xpm
+%%X11%%share/stamp/pixmaps/gtkstamp.xpm
+%%X11%%share/stamp/pixmaps/stamp.tif
+%%X11%%share/stamp/pixmaps/stamp.xpm
+%%X11%%share/stamp/pixmaps/stamp_not_working.xpm
+%%X11%%share/stamp/pixmaps/stamp_working.xpm
+%%X11%%share/stamp/pixmaps/transfer_not_working.xpm
+%%X11%%share/stamp/pixmaps/transfer_working.xpm
 @dirrm share/stamp/fonts
-@dirrm share/stamp/pixmaps
+%%X11%%@dirrm share/stamp/pixmaps
 @dirrm share/stamp