diff --git a/deskutils/xpostit/Makefile b/deskutils/xpostit/Makefile
index 262a8a88c129..800e5531ef79 100644
--- a/deskutils/xpostit/Makefile
+++ b/deskutils/xpostit/Makefile
@@ -1,20 +1,18 @@
 # Created by: joerg
 # $FreeBSD$
 
 PORTNAME=	xpostit
 PORTVERSION=	3.3.1
-PORTREVISION=	2
 CATEGORIES=	deskutils
-MASTER_SITES=	ftp://ftp.x.org/R5contrib/
-DISTNAME=	${PORTNAME}${PORTVERSION}
+MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}
+# DISTNAME=	${PORTNAME}${PORTVERSION:S/.//g}
+DISTNAME=	${PORTNAME}_${PORTVERSION}.orig
 
 MAINTAINER=	joerg@FreeBSD.org
 COMMENT=	PostIt (R) messages onto your X11 screen
 
-BROKEN=		unfetchable
-
-USES=		imake tar:Z xorg
+USES=		imake xorg
 USE_XORG=	ice sm x11 xaw xext xmu xpm xt
-WRKSRC=		${WRKDIR}/xpostit
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}.orig
 
 .include <bsd.port.mk>
diff --git a/deskutils/xpostit/distinfo b/deskutils/xpostit/distinfo
index a8138da3b0c9..9ed957ef74fa 100644
--- a/deskutils/xpostit/distinfo
+++ b/deskutils/xpostit/distinfo
@@ -1,2 +1,3 @@
-SHA256 (xpostit3.3.1.tar.Z) = 819fcf8c7197ab6be356c2ec298e0711e0fb4bf4c36608e9763f43d8ef4edad4
-SIZE (xpostit3.3.1.tar.Z) = 53910
+TIMESTAMP = 1584647660
+SHA256 (xpostit_3.3.1.orig.tar.gz) = 5b1d822cfcd8c5bd5af62e507b0b1c47c764a6307b3bc6eaf4e4be6d3dcd5b0a
+SIZE (xpostit_3.3.1.orig.tar.gz) = 29520