diff --git a/Makefile.files b/Makefile.files
index be55af3afd..2415c79086 100644
--- a/Makefile.files
+++ b/Makefile.files
@@ -145,6 +145,7 @@ avocado_SOURCES = \
 	RestHandler/RestActionHandler.cpp \
 	RestHandler/RestDocumentHandler.cpp \
 	RestHandler/RestEdgeHandler.cpp \
+	RestHandler/RestImportHandler.cpp \
 	RestHandler/RestVocbaseBaseHandler.cpp \
 	RestServer/ActionDispatcherThread.cpp \
 	RestServer/AvocadoHttpServer.cpp \
diff --git a/Makefile.in b/Makefile.in
index dddc6f7c61..8d7a784a58 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -254,6 +254,7 @@ am_avocado_OBJECTS = Admin/ApplicationAdminServer.$(OBJEXT) \
 	RestHandler/RestActionHandler.$(OBJEXT) \
 	RestHandler/RestDocumentHandler.$(OBJEXT) \
 	RestHandler/RestEdgeHandler.$(OBJEXT) \
+	RestHandler/RestImportHandler.$(OBJEXT) \
 	RestHandler/RestVocbaseBaseHandler.$(OBJEXT) \
 	RestServer/ActionDispatcherThread.$(OBJEXT) \
 	RestServer/AvocadoHttpServer.$(OBJEXT) \
@@ -713,6 +714,7 @@ avocado_SOURCES = \
 	RestHandler/RestActionHandler.cpp \
 	RestHandler/RestDocumentHandler.cpp \
 	RestHandler/RestEdgeHandler.cpp \
+	RestHandler/RestImportHandler.cpp \
 	RestHandler/RestVocbaseBaseHandler.cpp \
 	RestServer/ActionDispatcherThread.cpp \
 	RestServer/AvocadoHttpServer.cpp \
@@ -1544,6 +1546,8 @@ RestHandler/RestDocumentHandler.$(OBJEXT):  \
 	RestHandler/$(DEPDIR)/$(am__dirstamp)
 RestHandler/RestEdgeHandler.$(OBJEXT): RestHandler/$(am__dirstamp) \
 	RestHandler/$(DEPDIR)/$(am__dirstamp)
+RestHandler/RestImportHandler.$(OBJEXT): RestHandler/$(am__dirstamp) \
+	RestHandler/$(DEPDIR)/$(am__dirstamp)
 RestHandler/RestVocbaseBaseHandler.$(OBJEXT):  \
 	RestHandler/$(am__dirstamp) \
 	RestHandler/$(DEPDIR)/$(am__dirstamp)
@@ -1833,6 +1837,7 @@ mostlyclean-compile:
 	-rm -f RestHandler/RestActionHandler.$(OBJEXT)
 	-rm -f RestHandler/RestDocumentHandler.$(OBJEXT)
 	-rm -f RestHandler/RestEdgeHandler.$(OBJEXT)
+	-rm -f RestHandler/RestImportHandler.$(OBJEXT)
 	-rm -f RestHandler/RestVocbaseBaseHandler.$(OBJEXT)
 	-rm -f RestServer/ActionDispatcherThread.$(OBJEXT)
 	-rm -f RestServer/AvocadoHttpServer.$(OBJEXT)
@@ -2039,6 +2044,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@RestHandler/$(DEPDIR)/RestActionHandler.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@RestHandler/$(DEPDIR)/RestDocumentHandler.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@RestHandler/$(DEPDIR)/RestEdgeHandler.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@RestHandler/$(DEPDIR)/RestImportHandler.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@RestHandler/$(DEPDIR)/RestVocbaseBaseHandler.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@RestServer/$(DEPDIR)/ActionDispatcherThread.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@RestServer/$(DEPDIR)/AvocadoHttpServer.Po@am__quote@