diff --git a/sugar/p2p/Makefile.am b/sugar/p2p/Makefile.am
index be343601..6c86ed25 100644
--- a/sugar/p2p/Makefile.am
+++ b/sugar/p2p/Makefile.am
@@ -1,8 +1,12 @@
+SUBDIRS = model
+
 sugardir = $(pythondir)/sugar/p2p
 sugar_PYTHON =			\
 	__init__.py		\
 	Buddy.py		\
 	Group.py		\
+	NotificationListener.py	\
+	Notifier.py		\
 	Service.py		\
 	StreamReader.py		\
 	StreamWriter.py		\
diff --git a/sugar/p2p/model/Makefile.am b/sugar/p2p/model/Makefile.am
index c828a086..aa113c88 100644
--- a/sugar/p2p/model/Makefile.am
+++ b/sugar/p2p/model/Makefile.am
@@ -1,6 +1,7 @@
 sugardir = $(pythondir)/sugar/p2p/model
 sugar_PYTHON =			\
 	__init__.py		\
+	AbstractModel.py	\
 	LocalModel.py		\
 	RemoteModel.py		\
 	Store.py