diff --git a/doc/directories.doxygen b/doc/directories.doxygen
index 453d42a9d..7465afe85 100644
--- a/doc/directories.doxygen
+++ b/doc/directories.doxygen
@@ -44,15 +44,6 @@ driver is used.
 \dir src/eapol_supp EAPOL supplicant
 
 
-\dir src/hlr_auc_gw HLR/AuC gateway module for hostapd
-
-This is an example implementation of HLR/AuC gateway that hostapd can
-use for EAP-SIM and EAP-AKA server access. This example implements an
-internal authentication server using Milenage and GSM-Milenage.
-Alternative design could use this component as a gateway between an
-external HLR/AuC and EAP server code in hostapd.
-
-
 \dir src/l2_packet Layer 2 packet interface
 
 This module defines an interface for layer 2 (link layer) packet
diff --git a/doc/doxygen.conf b/doc/doxygen.conf
index 67c185b23..9c2fdf480 100644
--- a/doc/doxygen.conf
+++ b/doc/doxygen.conf
@@ -580,7 +580,6 @@ INPUT                  = \
 	src/eapol_supp \
 	src/eap_peer \
 	src/eap_server \
-	src/hlr_auc_gw \
 	src/l2_packet \
 	src/radius \
 	src/rsn_supp \
diff --git a/hostapd/Makefile b/hostapd/Makefile
index 42b17499e..a607be217 100644
--- a/hostapd/Makefile
+++ b/hostapd/Makefile
@@ -726,7 +726,7 @@ ifdef TLS_FUNCS
 LIBS_n += -lcrypto
 endif
 
-HOBJS += ../src/hlr_auc_gw/hlr_auc_gw.o ../src/utils/common.o ../src/utils/wpa_debug.o ../src/utils/os_$(CONFIG_OS).o ../src/utils/wpabuf.o ../src/crypto/milenage.o
+HOBJS += hlr_auc_gw.o ../src/utils/common.o ../src/utils/wpa_debug.o ../src/utils/os_$(CONFIG_OS).o ../src/utils/wpabuf.o ../src/crypto/milenage.o
 HOBJS += ../src/crypto/aes-encblock.o
 ifdef CONFIG_INTERNAL_AES
 HOBJS += ../src/crypto/aes-internal.o
diff --git a/src/hlr_auc_gw/hlr_auc_gw.c b/hostapd/hlr_auc_gw.c
similarity index 100%
rename from src/hlr_auc_gw/hlr_auc_gw.c
rename to hostapd/hlr_auc_gw.c
diff --git a/src/hlr_auc_gw/hlr_auc_gw.milenage_db b/hostapd/hlr_auc_gw.milenage_db
similarity index 100%
rename from src/hlr_auc_gw/hlr_auc_gw.milenage_db
rename to hostapd/hlr_auc_gw.milenage_db
diff --git a/src/Makefile b/src/Makefile
index 8aab4cc6b..faa589304 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,4 +1,4 @@
-SUBDIRS=common crypto drivers hlr_auc_gw eapol_auth eapol_supp eap_common eap_peer eap_server l2_packet radius rsn_supp tls utils wps
+SUBDIRS=common crypto drivers eapol_auth eapol_supp eap_common eap_peer eap_server l2_packet radius rsn_supp tls utils wps
 
 all:
 	for d in $(SUBDIRS); do [ -d $$d ] && $(MAKE) -C $$d; done
diff --git a/src/hlr_auc_gw/Makefile b/src/hlr_auc_gw/Makefile
deleted file mode 100644
index cffba620d..000000000
--- a/src/hlr_auc_gw/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-all:
-	@echo Nothing to be made.
-
-clean:
-	for d in $(SUBDIRS); do make -C $$d clean; done
-	rm -f *~ *.o *.d
-
-install:
-	@echo Nothing to be made.