Index: utils/ofhttp/Makefile
==================================================================
--- utils/ofhttp/Makefile
+++ utils/ofhttp/Makefile
@@ -10,13 +10,13 @@
 
 PACKAGE_NAME = ofhttp
 
 ${PROG}: ${LIBOBJFW_DEP_LVL2}
 
-CPPFLAGS += -I../../src			\
-	    -I../../src/runtime		\
-	    -I../../src/exceptions	\
-	    -I../..			\
-	    -DDATADIR=\"${datadir}\"
+CPPFLAGS += -I../../src					\
+	    -I../../src/runtime				\
+	    -I../../src/exceptions			\
+	    -I../..					\
+	    -DLANGUAGE_DIR=\"${datadir}/ofhttp/lang\"
 LIBS := -L../../src -lobjfw ${LIBS}
 LD = ${OBJC}
 LDFLAGS += ${LDFLAGS_RPATH}

Index: utils/ofhttp/OFHTTP.m
==================================================================
--- utils/ofhttp/OFHTTP.m
+++ utils/ofhttp/OFHTTP.m
@@ -245,12 +245,11 @@
 	};
 	OFOptionsParser *optionsParser = [OFOptionsParser
 	    parserWithOptions: options];
 	of_unichar_t option;
 
-	[OFLocalization addLanguageDirectory: [OFString pathWithComponents:
-	    [OFArray arrayWithObjects: @DATADIR, @"ofhttp", @"lang", nil]]];
+	[OFLocalization addLanguageDirectory: @LANGUAGE_DIR];
 
 	while ((option = [optionsParser nextOption]) != '\0') {
 		switch (option) {
 		case 'b':
 			[self setBody: [optionsParser argument]];