Index: extra.mk.in
==================================================================
--- extra.mk.in
+++ extra.mk.in
@@ -1,5 +1,9 @@
+OBJFW_LIB_MAJOR = 2
+OBJFW_LIB_MINOR = 0
+OBJFW_LIB_MAJOR_MINOR = ${OBJFW_LIB_MAJOR}.${OBJFW_LIB_MINOR}
+
 ASPRINTF_M = @ASPRINTF_M@
 ATOMIC_H = @ATOMIC_H@
 OBJC_PROPERTIES_M = @OBJC_PROPERTIES_M@
 OBJC_SYNC_M = @OBJC_SYNC_M@
 OFPLUGIN_M = @OFPLUGIN_M@

Index: generators/Makefile
==================================================================
--- generators/Makefile
+++ generators/Makefile
@@ -1,17 +1,21 @@
+include ../extra.mk
+
 PROG_NOINST = gen_tables${PROG_SUFFIX}
 SRCS = main.o		\
        TableGenerator.m
 
 .PHONY: run
 run: all UnicodeData.txt CaseFolding.txt
-	rm -f libobjfw.so.1 libobjfw.so.1.0 libobjfw.dll libobjfw.dylib
+	rm -f libobjfw.so.1 libobjfw.so.${OBJFW_LIB_MAJOR_MINOR}
+	rm -f libobjfw.dll libobjfw.dylib
 	if test -f ../src/libobjfw.so; then \
-		ln -s ../src/libobjfw.so libobjfw.so.1; \
-		ln -s ../src/libobjfw.so libobjfw.so.1.0; \
-	elif test -f ../src/libobjfw.so.1.0; then \
-		ln -s ../src/libobjfw.so.1.0 libobjfw.so.1.0; \
+		ln -s ../src/libobjfw.so libobjfw.so.${OBJFW_LIB_MAJOR}; \
+		ln -s ../src/libobjfw.so libobjfw.so.${OBJFW_LIB_MAJOR_MINOR}; \
+	elif test -f ../src/libobjfw.so.${OBJFW_LIB_MAJOR_MINOR}; then \
+		ln -s ../src/libobjfw.so.${OBJFW_LIB_MAJOR_MINOR} \
+			libobjfw.so.${OBJFW_LIB_MAJOR_MINOR}; \
 	fi
 	if test -f ../src/libobjfw.dll; then \
 		ln ../src/libobjfw.dll libobjfw.dll; \
 	fi
 	if test -f ../src/libobjfw.dylib; then \
@@ -19,11 +23,13 @@
 	fi
 	echo "Generating tables..."
 	LD_LIBRARY_PATH=.$${LD_LIBRARY_PATH+:}$$LD_LIBRARY_PATH \
 	DYLD_LIBRARY_PATH=.$${DYLD_LIBRARY_PATH+:}$$DYLD_LIBRARY_PATH \
 	${TEST_LAUNCHER} ./${PROG_NOINST}; EXIT=$$?; \
-	rm -f libobjfw.so.1 libobjfw.so.1.0 libobjfw.dll libobjfw.dylib; \
+	rm -f libobjfw.so.${OBJFW_LIB_MAJOR}; \
+	rm -f libobjfw.so.${OBJFW_LIB_MAJOR_MINOR} libobjfw.dll \
+	rm -f libobjfw.dylib; \
 	exit $$EXIT
 
 UnicodeData.txt:
 	wget http://unicode.org/Public/UNIDATA/UnicodeData.txt
 

Index: src/Makefile
==================================================================
--- src/Makefile
+++ src/Makefile
@@ -1,10 +1,10 @@
 include ../extra.mk
 
 LIB = ${LIB_PREFIX}objfw${LIB_SUFFIX}
-LIB_MAJOR = 1
-LIB_MINOR = 0
+LIB_MAJOR = ${OBJFW_LIB_MAJOR}
+LIB_MINOR = ${OBJFW_LIB_MINOR}
 
 SRCS = OFArray.m		\
        OFAutoreleasePool.m	\
        OFConstString.m		\
        OFDataArray.m		\

Index: tests/Makefile
==================================================================
--- tests/Makefile
+++ tests/Makefile
@@ -25,16 +25,18 @@
 .PHONY: run run-tests run-on-iphone
 run: all
 	if [ -z "${DONT_RUN_TESTS}" ]; then ${MAKE} ${MFLAGS} run-tests; fi
 
 run-tests:
-	rm -f libobjfw.so.1 libobjfw.so.1.0 libobjfw.dll libobjfw.dylib
+	rm -f libobjfw.so.1 libobjfw.so.${OBJFW_LIB_MAJOR_MINOR}
+	rm -f libobjfw.dll libobjfw.dylib
 	if test -f ../src/libobjfw.so; then \
-		ln -s ../src/libobjfw.so libobjfw.so.1; \
-		ln -s ../src/libobjfw.so libobjfw.so.1.0; \
-	elif test -f ../src/libobjfw.so.1.0; then \
-		ln -s ../src/libobjfw.so.1.0 libobjfw.so.1.0; \
+		ln -s ../src/libobjfw.so libobjfw.so.${OBJFW_LIB_MAJOR}; \
+		ln -s ../src/libobjfw.so libobjfw.so.${OBJFW_LIB_MAJOR_MINOR}; \
+	elif test -f ../src/libobjfw.so.${OBJFW_LIB_MAJOR_MINOR}; then \
+		ln -s ../src/libobjfw.so.${OBJFW_LIB_MAJOR_MINOR} \
+			libobjfw.so.${OBJFW_LIB_MAJOR_MINOR}; \
 	fi
 	if test -f ../src/libobjfw.dll; then \
 		ln ../src/libobjfw.dll libobjfw.dll; \
 	fi
 	if test -f ../src/libobjfw.dylib; then \
@@ -41,11 +43,13 @@
 		ln -s ../src/libobjfw.dylib libobjfw.dylib; \
 	fi
 	LD_LIBRARY_PATH=.$${LD_LIBRARY_PATH+:}$$LD_LIBRARY_PATH \
 	DYLD_LIBRARY_PATH=.$${DYLD_LIBRARY_PATH+:}$$DYLD_LIBRARY_PATH \
 	${TEST_LAUNCHER} ./${PROG_NOINST}; EXIT=$$?; \
-	rm -f libobjfw.so.1 libobjfw.so.1.0 libobjfw.dll libobjfw.dylib; \
+	rm -f libobjfw.so.${OBJFW_LIB_MAJOR}; \
+	rm -f libobjfw.so.${OBJFW_LIB_MAJOR_MINOR} libobjfw.dll \
+	rm -f libobjfw.dylib; \
 	exit $$EXIT
 
 run-on-iphone: all
 	if [ -z "${IPHONE_HOST}" ]; then \
 		echo "Please set IPHONE_HOST to the hostname of your iPhone!"; \