diff --git a/configure.ac b/configure.ac
index 230564b..7c8e08d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -185,6 +185,7 @@ AC_OUTPUT(
 	doc/Doxyfile
 	examples/Makefile
 	examples/properties/Makefile
+	examples/properties_get_set/Makefile
 	examples/echo/Makefile
 	examples/hal/Makefile
 	examples/glib/Makefile
diff --git a/examples/Makefile.am b/examples/Makefile.am
index b346604..d3cbb7c 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = properties echo hal glib
+SUBDIRS = properties properties_get_set echo hal glib
 
 MAINTAINERCLEANFILES = \
 	Makefile.in
diff --git a/tools/xml2cpp.cpp b/tools/xml2cpp.cpp
index 439a419..4a42c4e 100644
--- a/tools/xml2cpp.cpp
+++ b/tools/xml2cpp.cpp
@@ -257,6 +257,8 @@ void generate_proxy(Xml::Document &doc, const char *filename)
 
 		getline(ss, ifaceclass);
 
+		ifaceclass += "_proxy";
+
 		cerr << "generating code for interface " << ifacename << "..." << endl;
 
 		file << "class " << ifaceclass << endl
@@ -616,6 +618,8 @@ void generate_adaptor(Xml::Document &doc, const char *filename)
 
 		getline(ss, ifaceclass);
 
+		ifaceclass += "_adaptor";
+
 		cerr << "generating code for interface " << ifacename << "..." << endl;
 
 		file << "class " << ifaceclass << endl