diff --git a/lib/d/Makefile.am b/lib/d/Makefile.am
index 759677a..5e34f99 100644
--- a/lib/d/Makefile.am
+++ b/lib/d/Makefile.am
@@ -41,37 +41,37 @@
 d_async_DATA = $(addprefix src/, $(addsuffix .d, $(d_asyncmodules)))
 
 d_codegenmodules = $(addprefix thrift/codegen/, async_client \
-	async_client_pool base client client_pool idlgen processor)
+    async_client_pool base client client_pool idlgen processor)
 d_codegendir = $(d_thriftdir)/codegen
 d_codegen_DATA = $(addprefix src/, $(addsuffix .d, $(d_codegenmodules)))
 
 d_protocolmodules = $(addprefix thrift/protocol/, base binary compact json \
-	processor)
+    processor)
 d_protocoldir = $(d_thriftdir)/protocol
 d_protocol_DATA = $(addprefix src/, $(addsuffix .d, $(d_protocolmodules)))
 
 d_servermodules = $(addprefix thrift/server/, base simple nonblocking \
-	taskpool threaded)
+    taskpool threaded)
 d_serverdir = $(d_thriftdir)/server
 d_server_DATA = $(addprefix src/, $(addsuffix .d, $(d_servermodules)))
 
 d_servertransportmodules = $(addprefix thrift/server/transport/, base socket ssl)
 d_servertransportdir = $(d_thriftdir)/server/transport
 d_servertransport_DATA = $(addprefix src/, $(addsuffix .d, \
-	$(d_servertransportmodules)))
+    $(d_servertransportmodules)))
 
 d_transportmodules = $(addprefix thrift/transport/, base buffered file \
-	framed http memory piped range socket ssl zlib)
+    framed http memory piped range socket ssl zlib)
 d_transportdir = $(d_thriftdir)/transport
 d_transport_DATA = $(addprefix src/, $(addsuffix .d, $(d_transportmodules)))
 
 d_utilmodules = $(addprefix thrift/util/, awaitable cancellation future \
-	hashset)
+    hashset)
 d_utildir = $(d_thriftdir)/util
 d_util_DATA = $(addprefix src/, $(addsuffix .d, $(d_utilmodules)))
 
 d_internalmodules = $(addprefix thrift/internal/, algorithm codegen ctfe \
-	endian resource_pool socket ssl ssl_bio traits)
+    endian resource_pool socket ssl ssl_bio traits)
 d_internaldir = $(d_thriftdir)/internal
 d_internal_DATA = $(addprefix src/, $(addsuffix .d, $(d_internalmodules)))
 
@@ -80,8 +80,8 @@
 d_test_DATA = $(addprefix src/, $(addsuffix .d, $(d_testmodules)))
 
 d_publicmodules = $(d_thriftmodules) $(d_asyncmodules) \
-	$(d_codegenmodules) $(d_protocolmodules) $(d_servermodules) \
-	$(d_servertransportmodules) $(d_transportmodules) $(d_utilmodules)
+    $(d_codegenmodules) $(d_protocolmodules) $(d_servermodules) \
+    $(d_servertransportmodules) $(d_transportmodules) $(d_utilmodules)
 d_publicsources = $(addprefix src/, $(addsuffix .d, $(d_publicmodules)))
 
 d_modules = $(d_publicmodules) $(d_internalmodules) $(d_testmodules)
@@ -89,9 +89,9 @@
 # List modules with external dependencies and remove them from the main list
 d_libevent_dependent_modules = thrift/async/libevent thrift/server/nonblocking
 d_openssl_dependent_modules = thrift/async/ssl thrift/internal/ssl \
-	thrift/internal/ssl_bio thrift/transport/ssl thrift/server/transport/ssl
+    thrift/internal/ssl_bio thrift/transport/ssl thrift/server/transport/ssl
 d_main_modules = $(filter-out $(d_libevent_dependent_modules) \
-	$(d_openssl_dependent_modules),$(d_modules))
+    $(d_openssl_dependent_modules),$(d_modules))
 
 
 d_lib_flags = -w -wi -Isrc -lib
@@ -102,7 +102,7 @@
 #
 if HAVE_DEIMOS_EVENT2
 $(D_EVENT_LIB_NAME): $(addprefix src/, $(addsuffix .d, $(d_libevent_dependent_modules)))
-	$(DMD) -of$(D_EVENT_LIB_NAME) $(d_lib_flags) $^
+    $(DMD) -of$(D_EVENT_LIB_NAME) $(d_lib_flags) $^
 all_targets += $(D_EVENT_LIB_NAME)
 endif
 
@@ -111,7 +111,7 @@
 #
 if HAVE_DEIMOS_OPENSSL
 $(D_SSL_LIB_NAME): $(addprefix src/, $(addsuffix .d, $(d_openssl_dependent_modules)))
-	$(DMD) -of$(D_SSL_LIB_NAME) $(d_lib_flags) $^
+    $(DMD) -of$(D_SSL_LIB_NAME) $(d_lib_flags) $^
 all_targets += $(D_SSL_LIB_NAME)
 endif
 
@@ -119,7 +119,7 @@
 # Main library target.
 #
 $(D_LIB_NAME): $(addprefix src/, $(addsuffix .d, $(d_main_modules)))
-	$(DMD) -of$(D_LIB_NAME) $(d_lib_flags) $^
+    $(DMD) -of$(D_LIB_NAME) $(d_lib_flags) $^
 all_targets += $(D_LIB_NAME)
 
 
@@ -127,7 +127,7 @@
 # Documentation target (requires Dil).
 #
 docs: $(d_publicsources) src/thrift/index.d
-	dil ddoc docs -hl --kandil $^
+    dil ddoc docs -hl --kandil $^
 
 
 #
@@ -136,11 +136,11 @@
 all-local: $(all_targets)
 
 install-exec-local:
-	$(INSTALL_PROGRAM) $(all_targets) $(DESTDIR)$(libdir)
+    $(INSTALL_PROGRAM) $(all_targets) $(DESTDIR)$(libdir)
 
 
 clean-local:
-	$(RM) -rf docs $(D_LIB_NAME) $(D_EVENT_LIB_NAME) $(D_SSL_LIB_NAME) unittest
+    $(RM) -rf docs $(D_LIB_NAME) $(D_EVENT_LIB_NAME) $(D_SSL_LIB_NAME) unittest
 
 
 #
@@ -167,23 +167,23 @@
 endif
 
 unittest/emptymain.d: unittest/.directory
-	@echo 'void main(){}' >$@
+    @echo 'void main(){}' >$@
 
 unittest/.directory:
-	mkdir -p unittest || exists unittest
-	touch $@
+    mkdir -p unittest || exists unittest
+    touch $@
 
 unittest/debug/%: src/%.d $(all_targets) unittest/emptymain.d
-	$(DMD) -gc -of$(subst /,$(DMD_OF_DIRSEP),$@) $(d_test_flags) $^
+    $(DMD) -gc -of$(subst /,$(DMD_OF_DIRSEP),$@) $(d_test_flags) $^
 
 unittest/release/%: src/%.d $(all_targets) unittest/emptymain.d
-	$(DMD) -O -release -of$(subst /,$(DMD_OF_DIRSEP),$@) $(d_test_flags) $^
+    $(DMD) -O -release -of$(subst /,$(DMD_OF_DIRSEP),$@) $(d_test_flags) $^
 
 TESTS = $(addprefix unittest/debug/, $(d_test_modules)) \
-	$(addprefix unittest/release/, $(d_test_modules))
+    $(addprefix unittest/release/, $(d_test_modules))
 
 
 EXTRA_DIST = \
-	src \
-	test \
-	README.md
+    src \
+    test \
+    README.md
diff --git a/lib/d/test/Makefile.am b/lib/d/test/Makefile.am
index 0482583..b2f5a4b 100755
--- a/lib/d/test/Makefile.am
+++ b/lib/d/test/Makefile.am
@@ -26,33 +26,33 @@
 debug_proto_gen = $(addprefix gen-d/, DebugProtoTest_types.d)
 
 $(debug_proto_gen): $(top_srcdir)/test/DebugProtoTest.thrift
-	$(THRIFT) --gen d -nowarn $<
+    $(THRIFT) --gen d -nowarn $<
 
 stress_test_gen = $(addprefix gen-d/thrift/test/stress/, Service.d \
-	StressTest_types.d)
+    StressTest_types.d)
 
 $(stress_test_gen): $(top_srcdir)/test/StressTest.thrift
-	$(THRIFT) --gen d $<
+    $(THRIFT) --gen d $<
 
 thrift_test_gen = $(addprefix gen-d/thrift/test/, SecondService.d \
-	ThriftTest.d ThriftTest_constants.d ThriftTest_types.d)
+    ThriftTest.d ThriftTest_constants.d ThriftTest_types.d)
 
 $(thrift_test_gen): $(top_srcdir)/test/ThriftTest.thrift
-	$(THRIFT) --gen d $<
+    $(THRIFT) --gen d $<
 
 
 # The actual test targets.
 # There just must be some way to reassign a variable without warnings in
 # Automake...
 targets__ = async_test client_pool_test serialization_benchmark \
-	stress_test_server thrift_test_client thrift_test_server transport_test
+    stress_test_server thrift_test_client thrift_test_server transport_test
 ran_tests__ = client_pool_test \
-	transport_test \
-	async_test_runner.sh \
-	thrift_test_runner.sh
+    transport_test \
+    async_test_runner.sh \
+    thrift_test_runner.sh
 
 libevent_dependent_targets = async_test_client client_pool_test \
-	stress_test_server thrift_test_server
+    stress_test_server thrift_test_server
 libevent_dependent_ran_tests = client_pool_test async_test_runner.sh thrift_test_runner.sh
 
 openssl_dependent_targets = async_test thrift_test_client thrift_test_server
@@ -79,23 +79,23 @@
 endif
 
 d_test_flags += -w -wi -O -release -inline -I$(top_srcdir)/lib/d/src -Igen-d \
-	$(top_builddir)/lib/d/$(D_LIB_NAME)
+    $(top_builddir)/lib/d/$(D_LIB_NAME)
 
 
 async_test client_pool_test transport_test: %: %.d
-	$(DMD) $(d_test_flags) -of$@ $^
+    $(DMD) $(d_test_flags) -of$@ $^
 
 serialization_benchmark: %: %.d $(debug_proto_gen)
-	$(DMD) $(d_test_flags) -of$@ $^
+    $(DMD) $(d_test_flags) -of$@ $^
 
 stress_test_server: %: %.d test_utils.d $(stress_test_gen)
-	$(DMD) $(d_test_flags) -of$@ $^
+    $(DMD) $(d_test_flags) -of$@ $^
 
 thrift_test_client: %: %.d thrift_test_common.d $(thrift_test_gen)
-	$(DMD) $(d_test_flags) -of$@ $^
+    $(DMD) $(d_test_flags) -of$@ $^
 
 thrift_test_server: %: %.d thrift_test_common.d test_utils.d $(thrift_test_gen)
-	$(DMD) $(d_test_flags) -of$@ $^
+    $(DMD) $(d_test_flags) -of$@ $^
 
 
 # Certificate generation targets (for the SSL tests).
@@ -103,22 +103,22 @@
 # replaced by a more elaborate mechanism.
 
 server-certificate.pem: openssl.test.cnf
-	openssl req -new -x509 -nodes -config openssl.test.cnf \
-		-out server-certificate.pem
+    openssl req -new -x509 -nodes -config openssl.test.cnf \
+        -out server-certificate.pem
 
 trusted-ca-certificate.pem: server-certificate.pem
-	cat server-certificate.pem > $@
+    cat server-certificate.pem > $@
 
 check-local: $(targets)
 
 clean-local:
-	$(RM) -rf gen-d $(targets) $(addsuffix .o, $(targets))
+    $(RM) -rf gen-d $(targets) $(addsuffix .o, $(targets))
 
 
 # Tests ran as part of make check.
 
 async_test_runner.sh: async_test trusted-ca-certificate.pem server-certificate.pem
 thrift_test_runner.sh: thrift_test_client thrift_test_server \
-	trusted-ca-certificate.pem server-certificate.pem
+    trusted-ca-certificate.pem server-certificate.pem
 
 TESTS = $(ran_tests)