Index: ObjFW.xcodeproj/project.pbxproj
==================================================================
--- ObjFW.xcodeproj/project.pbxproj
+++ ObjFW.xcodeproj/project.pbxproj
@@ -5,20 +5,20 @@
 	};
 	objectVersion = 45;
 	objects = {
 
 /* Begin PBXAggregateTarget section */
-		4B5D8DDD1099E1B0000896FF /* autogen.sh */ = {
+		4B5D8DDD1099E1B0000896FF /* autoreconf */ = {
 			isa = PBXAggregateTarget;
-			buildConfigurationList = 4B5D8DE51099E1C5000896FF /* Build configuration list for PBXAggregateTarget "autogen.sh" */;
+			buildConfigurationList = 4B5D8DE51099E1C5000896FF /* Build configuration list for PBXAggregateTarget "autoreconf" */;
 			buildPhases = (
 				4B5D8DE11099E1BF000896FF /* ShellScript */,
 			);
 			dependencies = (
 			);
-			name = autogen.sh;
-			productName = autogen.sh;
+			name = autoreconf;
+			productName = autoreconf;
 		};
 		4BDF37AD1338047700F9A81A /* configure */ = {
 			isa = PBXAggregateTarget;
 			buildConfigurationList = 4BDF37AE1338047700F9A81A /* Build configuration list for PBXAggregateTarget "configure" */;
 			buildPhases = (
@@ -491,11 +491,11 @@
 		4BDF37B21338049600F9A81A /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
 			proxyType = 1;
 			remoteGlobalIDString = 4B5D8DDD1099E1B0000896FF;
-			remoteInfo = autogen.sh;
+			remoteInfo = autoreconf;
 		};
 		4BF33AF91338074A0059CEF7 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
 			proxyType = 1;
@@ -1926,11 +1926,11 @@
 			targets = (
 				4BF33AEF133807310059CEF7 /* Tests */,
 				4B3D23751337FBC800DD29B8 /* ObjFW */,
 				4B187E0D163EA29F0049A832 /* ObjFW-Bridge */,
 				4B23CA89133811610047A1D9 /* TestPlugin */,
-				4B5D8DDD1099E1B0000896FF /* autogen.sh */,
+				4B5D8DDD1099E1B0000896FF /* autoreconf */,
 				4BDF37AD1338047700F9A81A /* configure */,
 			);
 		};
 /* End PBXProject section */
 
@@ -1954,11 +1954,11 @@
 			);
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "if [ \"configure.ac\" -nt \"configure\" ]; then\n\t./autogen.sh || exit 1\nfi";
+			shellScript = "if [ \"configure.ac\" -nt \"configure\" ]; then\n\tautoreconf || exit 1\nfi";
 			showEnvVarsInLog = 0;
 		};
 		4BDF37B11338047D00F9A81A /* Run Script */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -2238,11 +2238,11 @@
 			target = 4BDF37AD1338047700F9A81A /* configure */;
 			targetProxy = 4B8BA41B133805A700E65070 /* PBXContainerItemProxy */;
 		};
 		4BDF37B31338049600F9A81A /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
-			target = 4B5D8DDD1099E1B0000896FF /* autogen.sh */;
+			target = 4B5D8DDD1099E1B0000896FF /* autoreconf */;
 			targetProxy = 4BDF37B21338049600F9A81A /* PBXContainerItemProxy */;
 		};
 		4BF33AFA1338074A0059CEF7 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			target = 4B3D23751337FBC800DD29B8 /* ObjFW */;
@@ -2509,11 +2509,11 @@
 				4B3D23881337FBC800DD29B8 /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		4B5D8DE51099E1C5000896FF /* Build configuration list for PBXAggregateTarget "autogen.sh" */ = {
+		4B5D8DE51099E1C5000896FF /* Build configuration list for PBXAggregateTarget "autoreconf" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				4B5D8DDE1099E1B1000896FF /* Debug */,
 				4B5D8DDF1099E1B1000896FF /* Release */,
 			);

Index: README-WINDOWS.md
==================================================================
--- README-WINDOWS.md
+++ README-WINDOWS.md
@@ -69,9 +69,9 @@
     $ git clone https://webkeks.org/git/objfw.git
 
   You can also download a release tarball if you want. Now go to the newly
   checked out repository and build and install it:
 
-    $ ./autogen.sh && ./configure && make -j16 install
+    $ autoreconf && ./configure && make -j16 install
 
   If everything was successfully, you can now build projects using ObjFW for
   Windows using the normal `objfw-compile` and friends.

Index: README.md
==================================================================
--- README.md
+++ README.md
@@ -17,11 +17,11 @@
     $ make install
 
   In case you checked out ObjFW from the Git repository, you need to run
   the following command first:
 
-    $ ./autogen.sh
+    $ autoreconf
 
 
 Building as a Mac OS X framework
 ================================
 

DELETED autogen.sh
Index: autogen.sh
==================================================================
--- autogen.sh
+++ autogen.sh
@@ -1,5 +0,0 @@
-#!/bin/sh
-set -e
-aclocal -I m4
-autoconf
-autoheader

Index: configure.ac
==================================================================
--- configure.ac
+++ configure.ac
@@ -1,14 +1,15 @@
 AC_INIT(ObjFW, 0.9-dev, js@webkeks.org)
 BUILDSYS_INIT
 
 AS_IF([test configure.ac -nt configure], [
-	AC_MSG_ERROR([configure.ac is newer than configure! Run ./autogen.sh!])
+	AC_MSG_ERROR([configure.ac is newer than configure! Run autoreconf!])
 ])
 
 AC_CONFIG_SRCDIR(src)
 AC_CONFIG_AUX_DIR(build-aux)
+AC_CONFIG_MACRO_DIR(m4)
 
 AC_CANONICAL_HOST
 
 case "$host" in
 	*-msdosdjgpp*)