diff --git a/graphics/ruby-gd/Makefile b/graphics/ruby-gd/Makefile
index 8b329b5fd347..e5c0b067f118 100644
--- a/graphics/ruby-gd/Makefile
+++ b/graphics/ruby-gd/Makefile
@@ -17,19 +17,28 @@ DIST_SUBDIR=	ruby
 
 MAINTAINER=	knu@FreeBSD.org
 
-LIB_DEPENDS=	gd.2:${PORTSDIR}/graphics/gd \
-		freetype.9:${PORTSDIR}/print/freetype2
+LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2
 
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
 USE_RUBY_RDTOOL=	yes
 
-CONFIGURE_ARGS=	--with-gd-include="${LOCALBASE}/include/gd" \
-		--with-gd-lib="${LOCALBASE}/lib" \
+RUBY_MODNAME=	${PORTNAME:L}
+
+CONFIGURE_ARGS=	--with-gd-lib="${LOCALBASE}/lib" \
 		--with-jpeg \
 		--with-freetype
 INSTALL_TARGET=	site-install
 
+.if defined(WITH_GD2)
+CONFIGURE_ARGS+=	----enable-gd2_0 \
+			--with-gd-include="${LOCALBASE}/include"
+LIB_DEPENDS+=	gd.4:${PORTSDIR}/graphics/gd
+.else
+CONFIGURE_ARGS+=	--with-gd-include="${LOCALBASE}/include/gd"
+LIB_DEPENDS+=	gd.2:${PORTSDIR}/graphics/gd
+.endif
+
 .include <bsd.port.pre.mk>
 
 # Hmm, GREP and TRUE seem to be defined in the bsd.port.post.mk stage.
@@ -64,16 +73,16 @@ post-patch:
 
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_EXAMPLESDIR}/gd
+	${MKDIR} ${RUBY_MODEXAMPLESDIR}
 .for f in ${EXAMPLES_EN}
-	${INSTALL_DATA} ${WRKSRC}/sample/${f} ${RUBY_EXAMPLESDIR}/gd/
+	${INSTALL_DATA} ${WRKSRC}/sample/${f} ${RUBY_MODEXAMPLESDIR}/
 .endfor
-	${MKDIR} ${RUBY_DOCDIR}/gd/ja
+	${MKDIR} ${RUBY_MODDOCDIR}/ja
 .for f in ${DOCS_EN}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/gd/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
 .endfor
 .for f in ${DOCS_JA}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/gd/ja/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/ja/
 .endfor
 .endif
 
diff --git a/graphics/ruby-gd/pkg-plist b/graphics/ruby-gd/pkg-plist
index 7080d3ecbdf3..54e781c78ab9 100644
--- a/graphics/ruby-gd/pkg-plist
+++ b/graphics/ruby-gd/pkg-plist
@@ -1,16 +1,16 @@
 %%RUBY_SITEARCHLIBDIR%%/GD.so
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gd/example.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gd/gdtestttf.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gd/webpng.rb
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/gd
-%%PORTDOCS%%%%RUBY_DOCDIR%%/gd/Changes
-%%PORTDOCS%%%%RUBY_DOCDIR%%/gd/INSTALL.en
-%%PORTDOCS%%%%RUBY_DOCDIR%%/gd/TODO
-%%PORTDOCS%%%%RUBY_DOCDIR%%/gd/manual.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/gd/manual.rd
-%%PORTDOCS%%%%RUBY_DOCDIR%%/gd/manual_index.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/gd/readme.en
-%%PORTDOCS%%%%RUBY_DOCDIR%%/gd/ja/INSTALL.ja
-%%PORTDOCS%%%%RUBY_DOCDIR%%/gd/ja/readme.ja
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/gd/ja
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/gd
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/example.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gdtestttf.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/webpng.rb
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/Changes
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/INSTALL.en
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/TODO
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/manual.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/manual.rd
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/manual_index.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/readme.en
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/INSTALL.ja
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/readme.ja
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/ja
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%