Index: usr.bin/svn/svn/Makefile
===================================================================
--- usr.bin/svn/svn/Makefile	(revision 278499)
+++ usr.bin/svn/svn/Makefile	(working copy)
@@ -54,8 +54,13 @@ DPSRCS+=	freebsd-organization.h
 CLEANFILES+=	freebsd-organization.h
 CFLAGS+=	-I. -DHAS_ORGANIZATION_NAME
 freebsd-organization.h:
-	@echo '#define ORGANIZATION_NAME ${ORGANIZATION}' \
+	@echo '#define ORGANIZATION_NAME	${ORGANIZATION}' \
 	    > freebsd-organization.h
+	@# Remove quotes from ORGANIZATION_NAME if they exist.
+	@sed -i '' -e 's,",,g' freebsd-organization.h
+	@# Quote ORGANIZATION_NAME, in case it is two or more words.
+	@sed -i '' -E 's,	,	",' freebsd-organization.h
+	@sed -i '' -E 's,$$,",' freebsd-organization.h
 .endif
 
 svnlite.1: svn.1