diff --git a/grc/ieee802_11_chunks_to_symbols.xml b/grc/ieee802_11_chunks_to_symbols.xml
new file mode 100644
index 0000000..2cdd2c5
--- /dev/null
+++ b/grc/ieee802_11_chunks_to_symbols.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<block>
+	<name>Chunks to Symbols</name>
+	<key>ieee802_11_chunks_to_symbols_xx</key>
+	<category>IEEE802.11</category>
+	<import>import ieee802_11</import>
+	<make>ieee802_11.chunks_to_symbols()</make>
+	<sink>
+		<name>in</name>
+		<type>byte</type>
+		<nports>1</nports>
+	</sink>
+	<source>
+		<name>out</name>
+		<type>complex</type>
+		<nports>1</nports>
+	</source>
+</block>
diff --git a/include/ieee802-11/chunks_to_symbols.h b/include/ieee802-11/chunks_to_symbols.h
new file mode 100644
index 0000000..be6ec86
--- /dev/null
+++ b/include/ieee802-11/chunks_to_symbols.h
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2013 Bastian Bloessl <bloessl@ccs-labs.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#ifndef INCLUDED_IEEE802_11_CHUNKS_TO_SYMBOLS_H
+#define INCLUDED_IEEE802_11_CHUNKS_TO_SYMBOLS_H
+
+#include <ieee802-11/api.h>
+#include <gnuradio/tagged_stream_block.h>
+
+namespace gr {
+namespace ieee802_11 {
+    
+class IEEE802_11_API chunks_to_symbols : virtual public tagged_stream_block
+{
+public:
+        typedef boost::shared_ptr<chunks_to_symbols> sptr;
+        static sptr make();
+};
+
+} /* namespace ieee802_11 */
+} /* namespace gr */
+
+#endif /* INCLUDED_IEEE802_11_CHUNKS_TO_SYMBOLS_H */
diff --git a/lib/chunks_to_symbols_impl.cc b/lib/chunks_to_symbols_impl.cc
new file mode 100644
index 0000000..8c532e7
--- /dev/null
+++ b/lib/chunks_to_symbols_impl.cc
@@ -0,0 +1,144 @@
+/*
+ * Copyright (C) 2013 Bastian Bloessl <bloessl@ccs-labs.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include "chunks_to_symbols_impl.h"
+#include "utils.h"
+#include <gnuradio/io_signature.h>
+#include <gnuradio/tag_checker.h>
+#include <assert.h>
+
+using namespace gr::ieee802_11;
+
+chunks_to_symbols::sptr
+chunks_to_symbols::make()
+{
+	return gnuradio::get_initial_sptr(new chunks_to_symbols_impl());
+}
+
+chunks_to_symbols_impl::chunks_to_symbols_impl()
+	: tagged_stream_block("wifi_chunks_to_symbols",
+			   io_signature::make(1, 1, sizeof(char)),
+			   io_signature::make(1, 1, sizeof(gr_complex)), "packet_len") {
+}
+
+chunks_to_symbols_impl::~chunks_to_symbols_impl() { }
+
+
+int
+chunks_to_symbols_impl::work(int noutput_items,
+		gr_vector_int &ninput_items,
+		gr_vector_const_void_star &input_items,
+		gr_vector_void_star &output_items) {
+
+	const unsigned char *in = (unsigned char*)input_items[0];
+	gr_complex *out = (gr_complex*)output_items[0];
+
+	std::vector<tag_t> tags;
+	get_tags_in_range(tags, 0, nitems_read(0),
+			nitems_read(0) + ninput_items[0],
+			pmt::mp("encoding"));
+	if(tags.size() != 1) {
+		throw std::runtime_error("no encoding in input stream");
+	}
+
+	Encoding encoding = (Encoding)pmt::to_long(tags[0].value);
+
+	const gr_complex *mapping;
+
+	switch (encoding) {
+	case BPSK_1_2:
+	case BPSK_3_4:
+		mapping = BPSK;
+		break;
+
+	case QPSK_1_2:
+	case QPSK_3_4:
+		mapping = QPSK;
+		break;
+
+	case QAM16_1_2:
+	case QAM16_3_4:
+		mapping = QAM16;
+		break;
+
+	case QAM64_2_3:
+	case QAM64_3_4:
+		mapping = QAM64;
+		break;
+
+	default:
+		throw std::invalid_argument("wrong encoding");
+		break;
+	}
+
+	for(int i = 0; i < ninput_items[0]; i++) {
+		out[i] = mapping[in[i]];
+	}
+
+	return ninput_items[0];
+}
+
+const gr_complex chunks_to_symbols_impl::BPSK[2] = {
+		gr_complex(-1.0, 0.0), gr_complex(1.0, 0.0)};
+
+const gr_complex chunks_to_symbols_impl::QPSK[4] = {
+		gr_complex(-0.7071, -0.7071), gr_complex(-0.7071, 0.7071),
+		gr_complex(+0.7071, -0.7071), gr_complex(+0.7071, 0.7071)};
+
+const gr_complex chunks_to_symbols_impl::QAM16[16] = {
+		gr_complex(-0.9487, -0.9487), gr_complex(-0.9487, -0.3162),
+		gr_complex(-0.9487, 0.9487), gr_complex(-0.9487, 0.3162),
+		gr_complex(-0.3162, -0.9487), gr_complex(-0.3162, -0.3162),
+		gr_complex(-0.3162, 0.9487), gr_complex(-0.3162, 0.3162),
+		gr_complex(0.9487, -0.9487), gr_complex(0.9487, -0.3162),
+		gr_complex(0.9487, 0.9487), gr_complex(0.9487, 0.3162),
+		gr_complex(0.3162, -0.9487), gr_complex(0.3162, -0.3162),
+		gr_complex(0.3162, 0.9487), gr_complex(0.3162, 0.3162)};
+
+const gr_complex chunks_to_symbols_impl::QAM64[64] = {
+		gr_complex(-1.0801, -1.0801), gr_complex(-1.0801, -0.7715),
+		gr_complex(-1.0801, -0.1543), gr_complex(-1.0801, -0.4629),
+		gr_complex(-1.0801, 1.0801), gr_complex(-1.0801, 0.7715),
+		gr_complex(-1.0801, 0.1543), gr_complex(-1.0801, 0.4629),
+		gr_complex(-0.7715, -1.0801), gr_complex(-0.7715, -0.7715),
+		gr_complex(-0.7715, -0.1543), gr_complex(-0.7715, -0.4629),
+		gr_complex(-0.7715, 1.0801), gr_complex(-0.7715, 0.7715),
+		gr_complex(-0.7715, 0.1543), gr_complex(-0.7715, 0.4629),
+		gr_complex(-0.1543, -1.0801), gr_complex(-0.1543, -0.7715),
+		gr_complex(-0.1543, -0.1543), gr_complex(-0.1543, -0.4629),
+		gr_complex(-0.1543, 1.0801), gr_complex(-0.1543, 0.7715),
+		gr_complex(-0.1543, 0.1543), gr_complex(-0.1543, 0.4629),
+		gr_complex(-0.4629, -1.0801), gr_complex(-0.4629, -0.7715),
+		gr_complex(-0.4629, -0.1543), gr_complex(-0.4629, -0.4629),
+		gr_complex(-0.4629, 1.0801), gr_complex(-0.4629, 0.7715),
+		gr_complex(-0.4629, 0.1543), gr_complex(-0.4629, 0.4629),
+		gr_complex(1.0801, -1.0801), gr_complex(1.0801, -0.7715),
+		gr_complex(1.0801, -0.1543), gr_complex(1.0801, -0.4629),
+		gr_complex(1.0801, 1.0801), gr_complex(1.0801, 0.7715),
+		gr_complex(1.0801, 0.1543), gr_complex(1.0801, 0.4629),
+		gr_complex(0.7715, -1.0801), gr_complex(0.7715, -0.7715),
+		gr_complex(0.7715, -0.1543), gr_complex(0.7715, -0.4629),
+		gr_complex(0.7715, 1.0801), gr_complex(0.7715, 0.7715),
+		gr_complex(0.7715, 0.1543), gr_complex(0.7715, 0.4629),
+		gr_complex(0.1543, -1.0801), gr_complex(0.1543, -0.7715),
+		gr_complex(0.1543, -0.1543), gr_complex(0.1543, -0.4629),
+		gr_complex(0.1543, 1.0801), gr_complex(0.1543, 0.7715),
+		gr_complex(0.1543, 0.1543), gr_complex(0.1543, 0.4629),
+		gr_complex(0.4629, -1.0801), gr_complex(0.4629, -0.7715),
+		gr_complex(0.4629, -0.1543), gr_complex(0.4629, -0.4629),
+		gr_complex(0.4629, 1.0801), gr_complex(0.4629, 0.7715),
+		gr_complex(0.4629, 0.1543), gr_complex(0.4629, 0.4629)};
+
diff --git a/lib/chunks_to_symbols_impl.h b/lib/chunks_to_symbols_impl.h
new file mode 100644
index 0000000..040df2f
--- /dev/null
+++ b/lib/chunks_to_symbols_impl.h
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2013 Bastian Bloessl <bloessl@ccs-labs.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#ifndef INCLUDED_IEEE802_11_CHUNKS_TO_SYMBOLS_IMPL_H
+#define INCLUDED_IEEE802_11_CHUNKS_TO_SYMBOLS_IMPL_H
+
+#include <ieee802-11/chunks_to_symbols.h>
+
+namespace gr {
+namespace ieee802_11 {
+
+class chunks_to_symbols_impl : public chunks_to_symbols
+{
+public:
+	chunks_to_symbols_impl();
+	~chunks_to_symbols_impl();
+
+	int work(int noutput_items,
+			gr_vector_int &ninput_itmes,
+			gr_vector_const_void_star &input_items,
+			gr_vector_void_star &output_items);
+
+protected:
+	static const gr_complex BPSK[2];
+	static const gr_complex QPSK[4];
+	static const gr_complex QAM16[16];
+	static const gr_complex QAM64[64];
+};
+
+} /* namespace ieee802_11 */
+} /* namespace gr */
+
+#endif /* INCLUDED_IEEE802_11_CHUNKS_TO_SYMBOLS_IMPL_H */