diff --git a/grc/CMakeLists.txt b/grc/CMakeLists.txt
index 51dcf3d..5d916ca 100644
--- a/grc/CMakeLists.txt
+++ b/grc/CMakeLists.txt
@@ -1,5 +1,6 @@
 
-install(FILES 
+install(FILES
+	ieee802_11_ether_encap.xml
 	ieee802_11_ofdm_decode_mac.xml
 	ieee802_11_ofdm_decode_signal.xml
 	ieee802_11_ofdm_equalize_symbols.xml
diff --git a/grc/ieee802_11_ether_encap.xml b/grc/ieee802_11_ether_encap.xml
new file mode 100644
index 0000000..34219c7
--- /dev/null
+++ b/grc/ieee802_11_ether_encap.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+
+<block>
+	<name>Ethernet Encapsulation</name>
+	<key>ieee802_11_ether_encap</key>
+	<category>IEEE802.11</category>
+	<import>import ieee802_11</import>
+	<make>ieee802_11.ether_encap($debug)</make>
+
+	<param>
+		<name>Debug</name>
+		<key>debug</key>
+		<value>False</value>
+		<type>bool</type>
+
+		<option>
+			<name>Enable</name>
+			<key>True</key>
+		</option>
+		<option>
+			<name>Disable</name>
+			<key>False</key>
+		</option>
+	</param>
+
+	<sink>
+		<name>in</name>
+		<type>message</type>
+	</sink>
+
+	<source>
+		<name>out</name>
+		<type>message</type>
+	</source>
+</block>
+
diff --git a/grc/ieee802_11_ofdm_decode_mac.xml b/grc/ieee802_11_ofdm_decode_mac.xml
index aee4299..5ce9ef5 100644
--- a/grc/ieee802_11_ofdm_decode_mac.xml
+++ b/grc/ieee802_11_ofdm_decode_mac.xml
@@ -4,8 +4,8 @@
 	<name>OFDM Decode MAC</name>
 	<key>ieee802_1_ofdm_decode_mac</key>
 	<category>IEEE802.11</category>
-	<import>import gnuradio.ieee802_11 as gr_ieee802_11</import>
-	<make>gr_ieee802_11.ofdm_decode_mac($debug)</make>
+	<import>import ieee802_11</import>
+	<make>ieee802_11.ofdm_decode_mac($debug)</make>
 
 	<param>
 		<name>Debug</name>
diff --git a/grc/ieee802_11_ofdm_decode_signal.xml b/grc/ieee802_11_ofdm_decode_signal.xml
index 5cde540..b30b569 100644
--- a/grc/ieee802_11_ofdm_decode_signal.xml
+++ b/grc/ieee802_11_ofdm_decode_signal.xml
@@ -4,8 +4,8 @@
 	<name>OFDM Decode Signal</name>
 	<key>ieee802_1_ofdm_decode_signal</key>
 	<category>IEEE802.11</category>
-	<import>import gnuradio.ieee802_11 as gr_ieee802_11</import>
-	<make>gr_ieee802_11.ofdm_decode_signal($debug)</make>
+	<import>import ieee802_11</import>
+	<make>ieee802_11.ofdm_decode_signal($debug)</make>
 
 	<param>
 		<name>Debug</name>
diff --git a/grc/ieee802_11_ofdm_equalize_symbols.xml b/grc/ieee802_11_ofdm_equalize_symbols.xml
index 66208e8..d5de198 100644
--- a/grc/ieee802_11_ofdm_equalize_symbols.xml
+++ b/grc/ieee802_11_ofdm_equalize_symbols.xml
@@ -4,8 +4,8 @@
 	<name>OFDM Equalize Symbols</name>
 	<key>ieee802_1_ofdm_equalize_symbols</key>
 	<category>IEEE802.11</category>
-	<import>import gnuradio.ieee802_11 as gr_ieee802_11</import>
-	<make>gr_ieee802_11.ofdm_equalize_symbols($debug)</make>
+	<import>import ieee802_11</import>
+	<make>ieee802_11.ofdm_equalize_symbols($debug)</make>
 
 	<param>
 		<name>Debug</name>
diff --git a/grc/ieee802_11_ofdm_parse_mac.xml b/grc/ieee802_11_ofdm_parse_mac.xml
index 8a515a0..a67d8f3 100644
--- a/grc/ieee802_11_ofdm_parse_mac.xml
+++ b/grc/ieee802_11_ofdm_parse_mac.xml
@@ -4,8 +4,8 @@
 	<name>OFDM Parse MAC</name>
 	<key>ieee802_11_ofdm_parse_mac</key>
 	<category>IEEE802.11</category>
-	<import>import gnuradio.ieee802_11 as gr_ieee802_11</import>
-	<make>gr_ieee802_11.ofdm_parse_mac($debug)</make>
+	<import>import ieee802_11</import>
+	<make>ieee802_11.ofdm_parse_mac($debug)</make>
 
 	<param>
 		<name>Debug</name>
diff --git a/grc/ieee802_11_ofdm_sync_long.xml b/grc/ieee802_11_ofdm_sync_long.xml
index 88d4846..9479e43 100644
--- a/grc/ieee802_11_ofdm_sync_long.xml
+++ b/grc/ieee802_11_ofdm_sync_long.xml
@@ -4,8 +4,8 @@
         <name>OFDM Sync Long</name>
 	<key>ieee802_1_ofdm_sync_long</key>
 	<category>IEEE802.11</category>
-	<import>import gnuradio.ieee802_11 as gr_ieee802_11</import>
-	<make>gr_ieee802_11.ofdm_sync_long($sync_length, $freq_est, $debug)</make>
+	<import>import ieee802_11</import>
+	<make>ieee802_11.ofdm_sync_long($sync_length, $freq_est, $debug)</make>
 
 	<param>
 		<name>Debug</name>
diff --git a/grc/ieee802_11_ofdm_sync_short.xml b/grc/ieee802_11_ofdm_sync_short.xml
index 22b8d64..40975ee 100644
--- a/grc/ieee802_11_ofdm_sync_short.xml
+++ b/grc/ieee802_11_ofdm_sync_short.xml
@@ -4,8 +4,8 @@
 	<name>OFDM Sync Short</name>
 	<key>ieee802_1_ofdm_sync_short</key>
 	<category>IEEE802.11</category>
-	<import>import gnuradio.ieee802_11 as gr_ieee802_11</import>
-	<make>gr_ieee802_11.ofdm_sync_short($threshold, $max_samples, $min_plateau, $debug)</make>
+	<import>import ieee802_11</import>
+	<make>ieee802_11.ofdm_sync_short($threshold, $max_samples, $min_plateau, $debug)</make>
 
 	<param>
 		<name>Debug</name>