diff --git a/sysutils/star/Makefile b/sysutils/star/Makefile
index b815c940165..6fa3e21aaf6 100644
--- a/sysutils/star/Makefile
+++ b/sysutils/star/Makefile
@@ -1,26 +1,26 @@
-# $OpenBSD: Makefile,v 1.1.1.1 1999/05/16 04:21:18 brad Exp $
+# $OpenBSD: Makefile,v 1.2 1999/10/27 01:12:03 brad Exp $
 # $FreeBSD: Makefile,v 1.7 1998/12/24 13:15:23 dirk Exp $
 
-DISTNAME=		star-1.2
-CATEGORIES=     	sysutils
-MASTER_SITES=		ftp://ftp.fokus.gmd.de/pub/unix/star/ \
-			${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR=	utils/compress
+DISTNAME=	star-1.2
+CATEGORIES=	sysutils
+MASTER_SITES=	ftp://ftp.fokus.gmd.de/pub/unix/star/ \
+		${MASTER_SITE_SUNSITE}
+MASTER_SITE_SUBDIR= utils/compress
 
-MAINTAINER=		naddy@unix-ag.uni-kl.de
+MAINTAINER=	naddy@unix-ag.uni-kl.de
 
-USE_GMAKE=		yes
-MAKE_ENV=		MAKEPROG=gmake CCOM=${CC}
+USE_GMAKE=	yes
+MAKE_ENV=	MAKEPROG="${GMAKE}" CCOM="${CC}"
 
 do-configure:
-.if ${MACHINE} != i386 || ${CC} != cc
+.if ${MACHINE} != "i386" || ${CC} != "cc"
 	@${RM} -f ${WRKSRC}/RULES/${MACHINE}-openbsd-${CC}.rul
 	@${CP} ${WRKSRC}/RULES/i386-openbsd-cc.rul \
 	 ${WRKSRC}/RULES/${MACHINE}-openbsd-${CC}.rul
 .endif
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/star/OBJ/*/star ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/star/OBJ/${MACHINE}-openbsd-${CC}/star ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/star/star.1 ${PREFIX}/man/man1
 
 .include <bsd.port.mk>