diff --git a/Makefile.am b/Makefile.am
index 480c21d1b..c111f30ec 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,11 +3,8 @@ BINFILES = \
 	bin/Pinta.Core.dll \
 	bin/Pinta.Gui.Widgets.dll \
 	bin/Pinta.Resources.dll \
-	bin/System.ComponentModel.Composition.dll
-	
-EXTENSIONS = \
-	bin/Extensions/Pinta.Effects.dll \
-	bin/Extensions/Pinta.Tools.dll
+	bin/Pinta.Effects.dll \
+	bin/Pinta.Tools.dll
 
 RELEASE_FILE = $(PACKAGE)-$(VERSION)
 
@@ -49,7 +46,7 @@ cleanobj:
 	find . -type d -name obj | xargs rm -rvf
 	
 # target: install - Installs Pinta. 
-install: pinta $(BINFILES) $(EXTENSIONS)
+install: pinta $(BINFILES)
 	$(XBUILD) /target:Install /property:InstallPrefix=$(DESTDIR)$(prefix) Pinta/Pinta.csproj
 	$(INSTALL_SCRIPT) pinta $(DESTDIR)$(prefix)/bin/$(PACKAGE)
 
@@ -61,11 +58,11 @@ uninstall:
 release: releasetar
 
 # target: releasetar - Make a release tarball.
-releasetar: $(BINFILES) $(EXTENSIONS)
+releasetar: $(BINFILES)
 	cd bin && tar -czf ../$(RELEASE_FILE).tgz --exclude=*mdb *
 
 # target: releasezip - Make a release zip file.
-releasezip: $(BINFILES) $(EXTENSIONS)
+releasezip: $(BINFILES)
 	cd bin && zip -r ../$(RELEASE_FILE).zip * -x "*.mdb"
 
 .PHONY: install uninstall cleanall cleanbin cleanobj release releasetar releasezip
diff --git a/Pinta/Pinta.csproj b/Pinta/Pinta.csproj
index 6c8e172fe..9a39c37ae 100644
--- a/Pinta/Pinta.csproj
+++ b/Pinta/Pinta.csproj
@@ -216,11 +216,9 @@
   <ItemGroup>
     <BinFiles Include="$(OutputPath)/Pinta.exe" />
     <BinFiles Include="$(OutputPath)/Pinta.*.dll" />
-    <ExtensionFiles Include="$(OutputPath)/Extensions/*.dll" />
   </ItemGroup>
   <Target Name="Install">
     <Copy SourceFiles="@(BinFiles)" DestinationFolder="$(InstallPrefix)/lib/pinta" />
-    <Copy SourceFiles="@(ExtensionFiles)" DestinationFolder="$(InstallPrefix)/lib/pinta/Extensions" />
     <MakeDir Directories="$(InstallPrefix)/bin" />
     <Copy SourceFiles="$(OutputPath)/locale/%(LocalePo.Code)/LC_MESSAGES/pinta.mo" DestinationFolder="$(InstallPrefix)/share/locale/%(LocalePo.Code)/LC_MESSAGES" />
     <Copy SourceFiles="../xdg/pinta.1" DestinationFolder="$(InstallPrefix)/share/man/man1" />