diff --git a/x11-toolkits/gtkada3/Makefile b/x11-toolkits/gtkada3/Makefile
index 184e31b14bed..116d8f9e69ee 100644
--- a/x11-toolkits/gtkada3/Makefile
+++ b/x11-toolkits/gtkada3/Makefile
@@ -2,12 +2,12 @@
 # $FreeBSD$
 
 PORTNAME=	gtkada
-PORTVERSION=	3.8.3.0
+PORTVERSION=	3.8.3.1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://downloads.dragonlace.net/src/
 PKGNAMESUFFIX=	3
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		gtkada-rm-${PORTVERSION}${EXTRACT_SUFX}
+		gtkada-rm-${RM_VERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	marino@FreeBSD.org
 COMMENT=	Ada graphical toolkit based on Gtk3 components
@@ -23,6 +23,7 @@ ALL_TARGET=	src
 NO_MTREE=	yes
 PORTDOCS=	gtkada_rm gtkada_ug
 PORTEXAMPLES=	testgtk
+RM_VERSION=	3.8.3.0
 
 MAKE_ARGS+=	PROCESSORS=${MAKE_JOBS_NUMBER} \
 		GL_SUPPORT=yes
@@ -30,10 +31,9 @@ MAKE_ARGS+=	PROCESSORS=${MAKE_JOBS_NUMBER} \
 CONFLICTS_INSTALL=	gtkada-*
 
 CONFIGURE_ARGS+=	--with-GL=auto \
-			--disable-gtkextra \
-			--enable-build=Production
+			--disable-gtkextra
 
-OPTIONS_DEFINE=		DOCS NLS EXAMPLES
+OPTIONS_DEFINE=		DOCS NLS EXAMPLES DEBUG
 
 .include <bsd.port.options.mk>
 
@@ -48,6 +48,12 @@ USES+=			gettext
 CONFIGURE_ARGS+=	--disable-nls
 .endif
 
+.if ${PORT_OPTIONS:MDEBUG}
+CONFIGURE_ARGS+=	--enable-build=Debug
+.else
+CONFIGURE_ARGS+=	--enable-build=Production
+.endif
+
 .if ${PORT_OPTIONS:MDOCS}
 ALL_TARGET+= docs
 .endif
@@ -56,6 +62,11 @@ ALL_TARGET+= docs
 ALL_TARGET+= tests
 .endif
 
+post-extract:
+.if ${PORTVERSION} != ${RM_VERSION}
+	${MV} ${WRKDIR}/gtkada-${RM_VERSION}/docs/* ${WRKSRC}/docs/
+.endif
+
 do-build:
 #	This target is recreated because -j cannot be set, but
 #	MAKE_JOBS_SAFE=yes is needed for PROCESSORS value
diff --git a/x11-toolkits/gtkada3/distinfo b/x11-toolkits/gtkada3/distinfo
index 066eed046173..21c19239c92a 100644
--- a/x11-toolkits/gtkada3/distinfo
+++ b/x11-toolkits/gtkada3/distinfo
@@ -1,4 +1,4 @@
-SHA256 (gtkada-3.8.3.0.tar.bz2) = 01b8a702287c0b1ae19d98d91f402d74071d271dc3b4519b32484fc47c0ed087
-SIZE (gtkada-3.8.3.0.tar.bz2) = 2968073
+SHA256 (gtkada-3.8.3.1.tar.bz2) = 7131011c7b6a78f5a944901f1db414f825b38fc696263ce7da442f5edb253058
+SIZE (gtkada-3.8.3.1.tar.bz2) = 3062671
 SHA256 (gtkada-rm-3.8.3.0.tar.bz2) = 445ed11620108a80ba76787b073f1c7b8931786bebaacc5c07710a35acac0991
 SIZE (gtkada-rm-3.8.3.0.tar.bz2) = 3368348