diff --git a/FreeBSD/Makefile b/FreeBSD/Makefile
index 0c05caa..da0ec67 100644
--- a/FreeBSD/Makefile
+++ b/FreeBSD/Makefile
@@ -14,7 +14,7 @@ LICENSE=	BSD2CLAUSE
 
 MAKEFILE=	makefile
 ALL_TARGET=	build
-MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}" \
+MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
 		CXX="${CXX}" CXXFLAGS="${CXXFLAGS}"
 
 PLIST_FILES=	bin/id3 man/man1/id3.1.gz
@@ -22,7 +22,10 @@ PORTDOCS=	README CHANGES
 
 OPTIONS_DEFINE=	DOCS
 
-CFLAGS+=	-Wno-parentheses
+USES=		iconv
+
+CFLAGS+=	-I${LOCALBASE}/include -Wno-parentheses
+LDFLAGS+=	-L${LOCALBASE}/lib ${ICONV_LIB}
 CXXFLAGS+=	-fno-rtti
 
 do-install:
diff --git a/makefile b/makefile
index 40a5d15..b6c223e 100644
--- a/makefile
+++ b/makefile
@@ -153,7 +153,7 @@ git-repo: .git
 .git:	# transform into a git working tree
 	which git
 	git init
-	git remote add origin -t master -f git@github.com:squell/id3.git
+	git remote add origin -t master -f https://github.com/squell/id3.git
 	git reset FETCH_HEAD
 
 AWKCMD = "BEGIN { pretty = \"figlet -fsmall\" } \