diff --git a/include/ki/pclass/PrimitiveType.h b/include/ki/pclass/PrimitiveType.h
index 306c1b1..825ca3d 100644
--- a/include/ki/pclass/PrimitiveType.h
+++ b/include/ki/pclass/PrimitiveType.h
@@ -68,4 +68,5 @@ namespace pclass
 }
 
 // Include all template specializations
-#include "ki/pclass/types/IntegralPrimitiveType.h"
\ No newline at end of file
+#include "ki/pclass/types/IntegralPrimitiveType.h"
+#include "ki/pclass/types/FloatingPointPrimitiveType.h"
\ No newline at end of file
diff --git a/include/ki/pclass/types/FloatingPointPrimitiveType.h b/include/ki/pclass/types/FloatingPointPrimitiveType.h
new file mode 100644
index 0000000..2ea84c3
--- /dev/null
+++ b/include/ki/pclass/types/FloatingPointPrimitiveType.h
@@ -0,0 +1,51 @@
+#pragma once
+#include <type_traits>
+#include "ki/util/BitTypes.h"
+
+namespace ki
+{
+	namespace pclass
+	{
+		template <typename ValueT>
+		struct PrimitiveTypeWriter<
+			ValueT,
+			typename std::enable_if<std::is_floating_point<ValueT>::value>::type
+		>
+		{
+			static void write_to(BitStream &stream, const ValueT &value)
+			{
+				// Reinterpret the reference as a reference to an integer
+				const uint_type &v = *((const uint_type *)&value);
+				stream.write<uint_type>(v, bitsizeof<ValueT>::value);
+			}
+
+		private:
+			/**
+			 * An unsigned integer type with the same size as the floating point type
+			 * ValueT.
+			 */
+			using uint_type = typename bits<bitsizeof<ValueT>::value>::uint_type;
+		};
+
+		template <typename ValueT>
+		struct PrimitiveTypeReader<
+			ValueT,
+			typename std::enable_if<std::is_floating_point<ValueT>::value>::type
+		>
+		{
+			static void read_from(BitStream &stream, ValueT &value)
+			{
+				// Reinterpret the reference as a reference to an integer
+				uint_type &v = *((uint_type *)&value);
+				v = stream.read<uint_type>(bitsizeof<ValueT>::value);
+			}
+
+		private:
+			/**
+			* An unsigned integer type with the same size as the floating point type
+			* ValueT.
+			*/
+			using uint_type = typename bits<bitsizeof<ValueT>::value>::uint_type;
+		};
+	}
+}
\ No newline at end of file
diff --git a/include/ki/pclass/types/IntegralPrimitiveType.h b/include/ki/pclass/types/IntegralPrimitiveType.h
index 833153d..f332205 100644
--- a/include/ki/pclass/types/IntegralPrimitiveType.h
+++ b/include/ki/pclass/types/IntegralPrimitiveType.h
@@ -1,5 +1,6 @@
 #pragma once
 #include <type_traits>
+#include "ki/util/BitTypes.h"
 
 namespace ki
 {
diff --git a/src/pclass/TypeSystem.cpp b/src/pclass/TypeSystem.cpp
index 066e74b..718213b 100644
--- a/src/pclass/TypeSystem.cpp
+++ b/src/pclass/TypeSystem.cpp
@@ -65,8 +65,10 @@ namespace pclass
 		define_primitive<bi<24>>("s24");
 		define_primitive<bui<24>>("u24");
 
-		// TODO: Define bit integer types
-		// TODO: Define floating point types
+		// Define floating point types
+		define_primitive<float>("float");
+		define_primitive<double>("double");
+
 		// TODO: Define bit floating point types
 		// TODO: Define string types
 	}