diff --git a/src/feedList.h b/src/rss/feedList.h
similarity index 100%
rename from src/feedList.h
rename to src/rss/feedList.h
diff --git a/src/feeddownloader.h b/src/rss/feeddownloader.h
similarity index 100%
rename from src/feeddownloader.h
rename to src/rss/feeddownloader.h
diff --git a/src/rss.cpp b/src/rss/rss.cpp
similarity index 100%
rename from src/rss.cpp
rename to src/rss/rss.cpp
diff --git a/src/rss.h b/src/rss/rss.h
similarity index 100%
rename from src/rss.h
rename to src/rss/rss.h
diff --git a/src/rss/rss.pri b/src/rss/rss.pri
new file mode 100644
index 000000000..aeed586f9
--- /dev/null
+++ b/src/rss/rss.pri
@@ -0,0 +1,19 @@
+INCLUDEPATH += $$PWD
+
+!contains(DEFINES, DISABLE_GUI) {
+
+  HEADERS +=  $$PWD/rss.h \
+              $$PWD/rss_imp.h \
+              $$PWD/rsssettings.h \
+              $$PWD/feeddownloader.h \
+              $$PWD/feedList.h \
+  
+  SOURCES += $$PWD/rss.cpp \
+             $$PWD/rss_imp.cpp \
+             $$PWD/rsssettings.cpp
+
+  FORMS +=   $$PWD/ui/rss.ui \
+             $$PWD/ui/feeddownloader.ui \
+             $$PWD/ui/rsssettings.ui
+
+}
\ No newline at end of file
diff --git a/src/rss_imp.cpp b/src/rss/rss_imp.cpp
similarity index 100%
rename from src/rss_imp.cpp
rename to src/rss/rss_imp.cpp
diff --git a/src/rss_imp.h b/src/rss/rss_imp.h
similarity index 100%
rename from src/rss_imp.h
rename to src/rss/rss_imp.h
diff --git a/src/rsssettings.cpp b/src/rss/rsssettings.cpp
similarity index 100%
rename from src/rsssettings.cpp
rename to src/rss/rsssettings.cpp
diff --git a/src/rsssettings.h b/src/rss/rsssettings.h
similarity index 100%
rename from src/rsssettings.h
rename to src/rss/rsssettings.h
diff --git a/src/ui/feeddownloader.ui b/src/rss/ui/feeddownloader.ui
similarity index 100%
rename from src/ui/feeddownloader.ui
rename to src/rss/ui/feeddownloader.ui
diff --git a/src/ui/rss.ui b/src/rss/ui/rss.ui
similarity index 100%
rename from src/ui/rss.ui
rename to src/rss/ui/rss.ui
diff --git a/src/ui/rsssettings.ui b/src/rss/ui/rsssettings.ui
similarity index 100%
rename from src/ui/rsssettings.ui
rename to src/rss/ui/rsssettings.ui
diff --git a/src/src.pro b/src/src.pro
index dcaa562c2..9f4d932ae 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -288,7 +288,6 @@ contains(DEFINES, DISABLE_GUI) {
   HEADERS += headlessloader.h
 } else {
   HEADERS +=  GUI.h \
-              feedList.h \
               supportedengines.h \
               transferlistwidget.h \
               transferlistdelegate.h \
@@ -304,7 +303,6 @@ contains(DEFINES, DISABLE_GUI) {
               peerlistwidget.h \
               peerlistdelegate.h \
               reverseresolution.h \
-              feeddownloader.h \
               trackersadditiondlg.h \
               searchtab.h \
               console_imp.h \
@@ -312,8 +310,6 @@ contains(DEFINES, DISABLE_GUI) {
               engineselectdlg.h \
               pluginsource.h \
               searchEngine.h \
-              rss.h \
-              rss_imp.h \
               speedlimitdlg.h \
               options_imp.h \
               about_imp.h \
@@ -328,7 +324,6 @@ contains(DEFINES, DISABLE_GUI) {
               pieceavailabilitybar.h \
               advancedsettings.h \
               cookiesdlg.h \
-              rsssettings.h \
               hidabletabwidget.h \
               sessionapplication.h
 
@@ -359,6 +354,7 @@ contains(DEFINES, USE_SYSTEM_QTSINGLEAPPLICATION) {
 
 include(qtlibtorrent/qtlibtorrent.pri)
 include(webui/webui.pri)
+include(rss/rss.pri)
 
 !contains(DEFINES, DISABLE_GUI) {
   FORMS += ui/mainwindow.ui \
@@ -370,18 +366,15 @@ include(webui/webui.pri)
            ui/downloadfromurldlg.ui \
            ui/torrentadditiondlg.ui \
            ui/search.ui \
-           ui/rss.ui \
            ui/bandwidth_limit.ui \
            ui/engineselect.ui \
            ui/pluginsource.ui \
            ui/trackersadditiondlg.ui \
            ui/console.ui \
-           ui/feeddownloader.ui \
            ui/propertieswidget.ui \
            ui/peer.ui \
            ui/confirmdeletiondlg.ui \
-           ui/cookiesdlg.ui \
-           ui/rsssettings.ui
+           ui/cookiesdlg.ui
 }
 
 SOURCES += main.cpp \
@@ -395,18 +388,15 @@ SOURCES += main.cpp \
              options_imp.cpp \
              createtorrent_imp.cpp \
              searchengine.cpp \
-             rss_imp.cpp \
              engineselectdlg.cpp \
              searchtab.cpp \
              ico.cpp \
-             rss.cpp \
              transferlistwidget.cpp \
              propertieswidget.cpp \
              peerlistwidget.cpp \
              cookiesdlg.cpp \
              trackerlist.cpp \
              torrentadditiondlg.cpp \
-             rsssettings.cpp \
              sessionapplication.cpp
 
   macx {