diff --git a/doc/directories.doxygen b/doc/directories.doxygen
index 016014ac1..453d42a9d 100644
--- a/doc/directories.doxygen
+++ b/doc/directories.doxygen
@@ -38,6 +38,9 @@ driver is used.
 \dir src/eap_server EAP server
 
 
+\dir src/eapol_auth EAPOL authenticator
+
+
 \dir src/eapol_supp EAPOL supplicant
 
 
diff --git a/hostapd/Makefile b/hostapd/Makefile
index f27abb47b..cd4bf7092 100644
--- a/hostapd/Makefile
+++ b/hostapd/Makefile
@@ -37,7 +37,7 @@ CFLAGS += -DCONFIG_NATIVE_WINDOWS
 LIBS += -lws2_32
 endif
 
-OBJS =	hostapd.o main.o ieee802_1x.o eapol_sm.o \
+OBJS =	hostapd.o main.o ieee802_1x.o \
 	config.o ieee802_11_auth.o \
 	sta_info.o wpa.o \
 	preauth.o pmksa_cache.o \
@@ -63,6 +63,8 @@ OBJS += ../src/utils/ip_addr.o
 OBJS += ../src/common/ieee802_11_common.o
 OBJS += ../src/common/wpa_common.o
 
+OBJS += ../src/eapol_auth/eapol_auth_sm.o
+
 ifdef CONFIG_NO_RADIUS
 CFLAGS += -DCONFIG_NO_RADIUS
 CONFIG_NO_ACCOUNTING=y
diff --git a/hostapd/hostapd.c b/hostapd/hostapd.c
index ed7c05483..47986b71c 100644
--- a/hostapd/hostapd.c
+++ b/hostapd/hostapd.c
@@ -21,7 +21,7 @@
 #include "beacon.h"
 #include "hw_features.h"
 #include "accounting.h"
-#include "eapol_sm.h"
+#include "eapol_auth/eapol_auth_sm.h"
 #include "iapp.h"
 #include "common/ieee802_11_defs.h"
 #include "ieee802_11_auth.h"
diff --git a/hostapd/ieee802_1x.c b/hostapd/ieee802_1x.c
index 21f78145e..6d9986d73 100644
--- a/hostapd/ieee802_1x.c
+++ b/hostapd/ieee802_1x.c
@@ -20,7 +20,7 @@
 #include "accounting.h"
 #include "radius/radius.h"
 #include "radius/radius_client.h"
-#include "eapol_sm.h"
+#include "eapol_auth/eapol_auth_sm.h"
 #include "md5.h"
 #include "crypto.h"
 #include "eloop.h"
diff --git a/hostapd/pmksa_cache.c b/hostapd/pmksa_cache.c
index 49d543d73..265235fd6 100644
--- a/hostapd/pmksa_cache.c
+++ b/hostapd/pmksa_cache.c
@@ -21,7 +21,7 @@
 #include "eloop.h"
 #include "sha1.h"
 #include "sha256.h"
-#include "eapol_sm.h"
+#include "eapol_auth/eapol_auth_sm.h"
 #include "pmksa_cache.h"
 
 
diff --git a/hostapd/preauth.c b/hostapd/preauth.c
index 3914d5ad4..e0f58536b 100644
--- a/hostapd/preauth.c
+++ b/hostapd/preauth.c
@@ -25,7 +25,7 @@
 #include "sta_flags.h"
 #include "sta_info.h"
 #include "common/wpa_common.h"
-#include "eapol_sm.h"
+#include "eapol_auth/eapol_auth_sm.h"
 #include "wpa.h"
 #include "preauth.h"
 
diff --git a/hostapd/wpa.c b/hostapd/wpa.c
index d38936854..ab9555709 100644
--- a/hostapd/wpa.c
+++ b/hostapd/wpa.c
@@ -18,7 +18,7 @@
 
 #include "common.h"
 #include "config.h"
-#include "eapol_sm.h"
+#include "eapol_auth/eapol_auth_sm.h"
 #include "wpa.h"
 #include "sha1.h"
 #include "sha256.h"
diff --git a/hostapd/wpa_auth_ie.c b/hostapd/wpa_auth_ie.c
index b56280feb..da37f8285 100644
--- a/hostapd/wpa_auth_ie.c
+++ b/hostapd/wpa_auth_ie.c
@@ -17,7 +17,7 @@
 #include "common.h"
 #include "config.h"
 #include "ieee802_11.h"
-#include "eapol_sm.h"
+#include "eapol_auth/eapol_auth_sm.h"
 #include "wpa.h"
 #include "pmksa_cache.h"
 #include "wpa_auth_ie.h"
diff --git a/hostapd/wps_hostapd.c b/hostapd/wps_hostapd.c
index e8704fbfc..61746426e 100644
--- a/hostapd/wps_hostapd.c
+++ b/hostapd/wps_hostapd.c
@@ -24,7 +24,7 @@
 #include "common/ieee802_11_common.h"
 #include "sta_flags.h"
 #include "sta_info.h"
-#include "eapol_sm.h"
+#include "eapol_auth/eapol_auth_sm.h"
 #include "wps/wps.h"
 #include "wps/wps_defs.h"
 #include "wps/wps_dev_attr.h"
diff --git a/hostapd/eapol_sm.c b/src/eapol_auth/eapol_auth_sm.c
similarity index 99%
rename from hostapd/eapol_sm.c
rename to src/eapol_auth/eapol_auth_sm.c
index 186688604..27034791e 100644
--- a/hostapd/eapol_sm.c
+++ b/src/eapol_auth/eapol_auth_sm.c
@@ -15,7 +15,7 @@
 #include "includes.h"
 
 #include "common.h"
-#include "eapol_sm.h"
+#include "eapol_auth_sm.h"
 #include "eloop.h"
 #include "common/eapol_common.h"
 #include "eap_server/eap.h"
diff --git a/hostapd/eapol_sm.h b/src/eapol_auth/eapol_auth_sm.h
similarity index 99%
rename from hostapd/eapol_sm.h
rename to src/eapol_auth/eapol_auth_sm.h
index 8f5877d36..3e4dd33e2 100644
--- a/hostapd/eapol_sm.h
+++ b/src/eapol_auth/eapol_auth_sm.h
@@ -12,8 +12,8 @@
  * See README and COPYING for more details.
  */
 
-#ifndef EAPOL_SM_H
-#define EAPOL_SM_H
+#ifndef EAPOL_AUTH_SM_H
+#define EAPOL_AUTH_SM_H
 
 #include "common/defs.h"
 #include "radius/radius.h"
@@ -251,4 +251,4 @@ void eapol_auth_dump_state(FILE *f, const char *prefix,
 			   struct eapol_state_machine *sm);
 int eapol_auth_eap_pending_cb(struct eapol_state_machine *sm, void *ctx);
 
-#endif /* EAPOL_SM_H */
+#endif /* EAPOL_AUTH_SM_H */
diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile
index 656f69e4a..a8d2a1d4e 100644
--- a/wpa_supplicant/Makefile
+++ b/wpa_supplicant/Makefile
@@ -589,7 +589,7 @@ OBJS += ../hostapd/wpa_auth_ie.o
 OBJS += ../hostapd/tkip_countermeasures.o
 OBJS += ../hostapd/mlme.o
 OBJS += ../hostapd/ieee802_1x.o
-OBJS += ../hostapd/eapol_sm.o
+OBJS += ../src/eapol_auth/eapol_auth_sm.o
 OBJS += ../hostapd/ieee802_11_auth.o
 OBJS += ../hostapd/drv_callbacks.o
 ifdef CONFIG_CTRL_IFACE
@@ -636,7 +636,7 @@ OBJS_h += ../src/radius/radius_client.o
 endif
 
 ifdef CONFIG_AUTHENTICATOR
-OBJS_h += ../hostapd/eapol_sm.o
+OBJS_h += ../eapol_auth/eapol_auth_sm.o
 OBJS_h += ../hostapd/ieee802_1x.o
 endif