diff --git a/src/edf.cpp b/src/edf.cpp
index 3676e445c..50ac2835c 100644
--- a/src/edf.cpp
+++ b/src/edf.cpp
@@ -47,6 +47,7 @@
 #include "p_tags.h"
 #include "p_terrain.h"
 #include "v_palette.h"
+#include "p_acs.h"
 #include "r_data/colormaps.h"
 
 
@@ -770,4 +771,14 @@ void ProcessEDFSectors()
 		}
 	}
 	delete[] edfsectorrecord;
-}
\ No newline at end of file
+}
+
+void LoadMapinfoACSLump()
+{
+	FEdfOptions *opt = level.info->GetOptData<FEdfOptions>("EDF", false);
+	if (opt != NULL)
+	{
+		int lump = Wads.CheckNumForName(opt->acsName);
+		if (lump >= 0) FBehavior::StaticLoadModule(lump);
+	}
+}
diff --git a/src/p_setup.cpp b/src/p_setup.cpp
index 6bbb85035..46f984bf1 100644
--- a/src/p_setup.cpp
+++ b/src/p_setup.cpp
@@ -3702,6 +3702,10 @@ void P_SetupLevel (const char *lumpname, int position)
 		}
 
 		FBehavior::StaticLoadDefaultModules ();
+#ifndef NO_EDF
+		LoadMapinfoACSLump();
+#endif
+
 
 		P_LoadStrifeConversations (map, lumpname);