--- a/Makefile.am
+++ b/Makefile.am
@@ -8,33 +8,41 @@
 bin_PROGRAMS = upmpdcli
 
 upmpdcli_SOURCES = \
+     src/avtransport.cxx \
+     src/avtransport.hxx \
+     src/execmd.cpp \
+     src/execmd.h \
+     src/netcon.cpp \
+     src/netcon.h \
+     src/closefrom.cpp \
+     src/closefrom.h \
      src/conftree.cxx \
      src/conftree.hxx \
+     src/conman.cxx \
+     src/conman.hxx \
+     src/mpdcli.cxx \
+     src/mpdcli.hxx \
+     src/ohinfo.cxx \
+     src/ohinfo.hxx \
      src/ohmetacache.cxx \
      src/ohmetacache.hxx \
-     src/mpdcli.cxx \
-     src/mpdcli.hxx \
+     src/ohplaylist.cxx \
+     src/ohplaylist.hxx \
+     src/ohproduct.cxx \
+     src/ohreceiver.hxx \
+     src/ohreceiver.cxx \
+     src/ohproduct.hxx \
+     src/ohtime.cxx \
+     src/ohtime.hxx \
+     src/ohvolume.cxx \
+     src/ohvolume.hxx \
+     src/ptmutex.hxx \
+     src/renderctl.cxx \
+     src/renderctl.hxx \
+     src/upmpd.cxx \
      src/upmpd.hxx \
-     src/upmpd.cxx \
      src/upmpdutils.cxx \
      src/upmpdutils.hxx \
-     src/renderctl.hxx \
-     src/renderctl.cxx \
-     src/avtransport.hxx \
-     src/avtransport.cxx \
-     src/conman.hxx \
-     src/conman.cxx \
-     src/ohproduct.hxx \
-     src/ohproduct.cxx \
-     src/ohinfo.hxx \
-     src/ohinfo.cxx \
-     src/ohtime.hxx \
-     src/ohtime.cxx \
-     src/ohvolume.hxx \
-     src/ohvolume.cxx \
-     src/ohplaylist.hxx \
-     src/ohplaylist.cxx \
-     src/ptmutex.hxx \
      src/workqueue.hxx
                            
 upmpdcli_LDADD = -lupnpp -lmpdclient -lpthread
@@ -42,7 +50,8 @@
 dist_pkgdata_DATA = src/description.xml src/AVTransport.xml \
                   src/RenderingControl.xml src/ConnectionManager.xml \
                   src/OHProduct.xml src/OHInfo.xml src/OHTime.xml \
-                  src/OHVolume.xml src/OHPlaylist.xml src/protocolinfo.txt
+                  src/OHVolume.xml src/OHPlaylist.xml src/OHReceiver.xml \
+                  src/protocolinfo.txt
 
 dist_sysconf_DATA = src/upmpdcli.conf