diff --git a/usr.bin/csup/Makefile b/usr.bin/csup/Makefile
index af1815cb14e5..92d946c92dcb 100644
--- a/usr.bin/csup/Makefile
+++ b/usr.bin/csup/Makefile
@@ -1,22 +1,40 @@
 # $FreeBSD$
 
-PREFIX?=	/usr/local
-BINDIR?=	${PREFIX}/bin
-MANDIR?=	${PREFIX}/man/man
-
-UNAME!=		/usr/bin/uname -s
-
 PROG=	csup
-SRCS=	attrstack.c auth.c config.c detailer.c diff.c fattr.c fixups.c fnmatch.c \
-	globtree.c idcache.c keyword.c lister.c main.c misc.c mux.c parse.y \
-	pathcomp.c proto.c status.c stream.c threads.c token.l updater.c \
-	rcsfile.c rcsparse.c lex.rcs.c rsyncfile.c
+SRCS=	attrstack.c \
+	auth.c \
+	config.c \
+	detailer.c \
+	diff.c \
+	fattr.c \
+	fixups.c \
+	fnmatch.c \
+	globtree.c \
+	idcache.c \
+	keyword.c \
+	lex.rcs.c \
+	lister.c \
+	main.c \
+	misc.c \
+	mux.c \
+	parse.y \
+	pathcomp.c \
+	proto.c \
+	rcsfile.c \
+	rcsparse.c \
+	rsyncfile.c \
+	status.c \
+	stream.c \
+	threads.c \
+	token.l \
+	updater.c
 
-CFLAGS+=	-I. -I${.CURDIR} -g -pthread -DHAVE_FFLAGS -DNDEBUG
-WARNS?=		1
+CFLAGS+= -I. -I${.CURDIR}/../../contrib/csup
+CFLAGS+= -DHAVE_FFLAGS -DNDEBUG
+WARNS?=	1
 
-DPADD=	${LIBCRYPTO} ${LIBZ}
-LDADD=	-lcrypto -lz
+DPADD=	${LIBCRYPTO} ${LIBZ} ${LIBPTHREAD}
+LDADD=	-lcrypto -lz -lpthread
 
 SCRIPTS=	cpasswd.sh
 MAN=		csup.1 cpasswd.1