diff --git a/ridlbe/c++11/templates/cli/hdr/bitset.erb b/ridlbe/c++11/templates/cli/hdr/bitset.erb
index a5149b7f..8123b1f4 100644
--- a/ridlbe/c++11/templates/cli/hdr/bitset.erb
+++ b/ridlbe/c++11/templates/cli/hdr/bitset.erb
@@ -1,13 +1,32 @@
 
 // generated from <%= ridl_template_path %>
 /// @copydoc <%= doc_scoped_name %>
-/// THIS MAPPING IS NOT COMPLETE
-struct <%= cxxname %>
+/// @todo THIS MAPPING IS NOT COMPLETE
+class <%= cxxname %><% unless base.nil? %> : public <%= base.cxxname %><% end %>
 {
-%bitfields.each do |_bitfield|
-  /// @copydoc #{doc_scoped_name}::#{_bitfield.name}
-  <%= _bitfield.cxx_member_type %> <%= _bitfield.cxxname %> : <%= _bitfield.bits %>;
+public:
+  <%= cxxname %> () = default;
+  ~<%= cxxname %> () noexcept = default;
+  <%= cxxname %> (const <%= cxxname %>&) = default;
+  <%= cxxname %> (<%= cxxname %>&&) = default;
+  <%= cxxname %>& operator= (const <%= cxxname %>&) = default;
+  <%= cxxname %>& operator= (<%= cxxname %>&&) = default;
+
+%bitfields.each do |_m|
+% unless _m.cxxname.empty?
+  inline void <%= _m.cxxname %> (<%= _m.cxx_in_type %> _x11_<%= _m.cxxname %>) { this->_taox11_<%= cxxname.downcase %>.<%= _m.cxxname %> = _x11_<%= _m.cxxname %>; }
+  inline <%= _m.cxx_in_type %> <%= _m.cxxname %> () const { return this->_taox11_<%= cxxname.downcase %>.<%= _m.cxxname %>; }
+% end
+%end
+
+private:
+  struct
+  {
+%bitfields.each do |bitfield|
+    /// @copydoc #{bitfield.doc_scoped_name}::#{bitfield.name}
+    <%= bitfield.cxx_member_type %> <%= bitfield.cxxname %> : <%= bitfield.bits %>;
 %end
+  } _taox11_<%= cxxname.downcase %>;
 }; // <%= cxxname %>
 
 % visit_template('typecode') if generate_typecode_support?
diff --git a/ridlbe/c++11/templates/cli/hdr/bitset_idl_traits.erb b/ridlbe/c++11/templates/cli/hdr/bitset_idl_traits.erb
new file mode 100644
index 00000000..9a4a83e5
--- /dev/null
+++ b/ridlbe/c++11/templates/cli/hdr/bitset_idl_traits.erb
@@ -0,0 +1,47 @@
+
+%# TODO handle inheritance
+// generated from <%= ridl_template_path %>
+template<>
+struct traits <<%= scoped_cxxtype %>>
+  : IDL::common_byval_traits<<%= scoped_cxxtype %>>
+{
+  template <typename OStrm_, typename Formatter = formatter<value_type, OStrm_>>
+  static inline OStrm_& write_on(OStrm_& os_, in_type val_, Formatter fmt_ = Formatter ())
+  {
+    return fmt_ (os_, val_);
+  }
+
+  template <typename Formatter = std::false_type>
+  static inline __Writer<Formatter> write (in_type val) { return {val}; }
+};
+
+template <typename OStrm_>
+struct formatter<<%= scoped_cxxtype %>, OStrm_>
+{
+  inline OStrm_& operator ()(OStrm_& os_, <%= scoped_cxx_in_type %> val_)
+  {
+%_sep = nil
+    os_ << "<%= formatted_cxxname %>{"
+%bitfields.each do |_m|
+% unless _m.cxxname.empty?
+        << "<%= _sep %><%= _m.cxxname %>=" << IDL::traits<<%= _m.scoped_cxxtype %>>::write(val_.<%= _m.cxxname %> ())
+%     _sep = ',' unless _sep
+% end
+%end
+        << '}';
+    return os_;
+  }
+};
+
+template <typename OStrm_, typename Fmt>
+inline OStrm_& operator <<(OStrm_& os, IDL::traits<<%= scoped_cxxtype %>>::__Writer<Fmt> w)
+{
+  using writer_t = IDL::traits<<%= scoped_cxxtype %>>::__Writer<Fmt>;
+  using formatter_t = typename std::conditional<
+                        std::is_same<
+                          typename writer_t::formatter_t,
+                          std::false_type>::value,
+                        formatter<<%= scoped_cxxtype %>, OStrm_>,
+                        typename writer_t::formatter_t>::type;
+  return IDL::traits<<%= scoped_cxxtype %>>::write_on (os, w.val_, formatter_t ());
+}
diff --git a/ridlbe/c++11/visitors/bitset.rb b/ridlbe/c++11/visitors/bitset.rb
index c982e7ac..82376f26 100644
--- a/ridlbe/c++11/visitors/bitset.rb
+++ b/ridlbe/c++11/visitors/bitset.rb
@@ -17,6 +17,11 @@ def bitfields
         }
       end
 
+      # Return the base of this bitset, nil in case of no base bitset
+      def base
+        node.base
+      end
+
       # template mapping
 
       map_template :bitset, :bitset
diff --git a/ridlbe/c++11/writers/stubheader.rb b/ridlbe/c++11/writers/stubheader.rb
index b676beaf..945e393e 100644
--- a/ridlbe/c++11/writers/stubheader.rb
+++ b/ridlbe/c++11/writers/stubheader.rb
@@ -518,6 +518,10 @@ def visit_bitmask(node)
         visitor(BitmaskVisitor).visit_idl_traits(node)
       end
 
+      def visit_bitset(node)
+        visitor(BitsetVisitor).visit_idl_traits(node)
+      end
+
       def declare_struct(node)
         visitor(StructVisitor).visit_idl_traits(node)
       end
diff --git a/tests/idl4/illegal_idl/bitset_inherit_struct.idl b/tests/idl4/illegal_idl/bitset_inherit_struct.idl
new file mode 100644
index 00000000..c4f7135e
--- /dev/null
+++ b/tests/idl4/illegal_idl/bitset_inherit_struct.idl
@@ -0,0 +1,16 @@
+/**
+ * @file bitset_inherit_struct.idl
+ * @author Johnny Willemsen
+ *
+ * ridlc shall reject use of a bitset which inherits from a struct
+ *
+ * @copyright Copyright (c) Remedy IT Expertise BV
+ */
+
+struct Base {
+  short Foo;
+};
+
+bitset MyBitset : Base {
+  bitfield<6> x;
+};
diff --git a/tests/idl4/illegal_idl/bitset_multiple_inheritance.idl b/tests/idl4/illegal_idl/bitset_multiple_inheritance.idl
new file mode 100644
index 00000000..61f61d11
--- /dev/null
+++ b/tests/idl4/illegal_idl/bitset_multiple_inheritance.idl
@@ -0,0 +1,20 @@
+/**
+ * @file bitset_multiple_inheritance.idl
+ * @author Johnny Willemsen
+ *
+ * ridlc shall reject use of a bitset which inherits from multiple bases
+ *
+ * @copyright Copyright (c) Remedy IT Expertise BV
+ */
+
+bitset Base1 {
+  bitfield<1> y;
+};
+
+bitset Base2 {
+  bitfield<1> z;
+};
+
+bitset MyBitset : Base1, Base2 {
+  bitfield<6> x;
+};