diff --git a/net/gnosamba/Makefile b/net/gnosamba/Makefile
index a6aac19c59a4..fbbb4e04eaec 100644
--- a/net/gnosamba/Makefile
+++ b/net/gnosamba/Makefile
@@ -8,15 +8,18 @@
 PORTNAME=	gnosamba
 PORTVERSION=	0.3.3
 CATEGORIES=	net gnome
-MASTER_SITES=	http://linuxberg.ii.net/files/gnome/network/ \
-		http://www.open-systems.com/gnosamba/
+MASTER_SITES=	${MASTER_SITE_DEBIAN}
+MASTER_SITE_SUBDIR=	pool/main/g/gnosamba
+DISTNAME=	${PORTNAME}_${PORTVERSION}.orig
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Samba configuration tool for X Window System
 
-USE_REINPLACE=	yes
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}.orig
+
 USE_X_PREFIX=	yes
-USE_GNOME=	yes
+USE_GNOME=	gnomelibs
+USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 
 post-patch:
diff --git a/net/gnosamba/distinfo b/net/gnosamba/distinfo
index b0a220d20f36..6a858d505366 100644
--- a/net/gnosamba/distinfo
+++ b/net/gnosamba/distinfo
@@ -1 +1 @@
-MD5 (gnosamba-0.3.3.tar.gz) = 38d9dfc2b0099aaea4bde4d8b064bc9f
+MD5 (gnosamba_0.3.3.orig.tar.gz) = 1daf7179a5600de71eb4ac99ea3a5db3