diff -Nru xfce4-indicator-plugin-2.3.3/debian/changelog xfce4-indicator-plugin-2.3.3/debian/changelog
--- xfce4-indicator-plugin-2.3.3/debian/changelog	2018-03-20 19:12:50.000000000 +0000
+++ xfce4-indicator-plugin-2.3.3/debian/changelog	2017-10-15 14:32:43.000000000 +0000
@@ -1,15 +1,3 @@
-xfce4-indicator-plugin (2.3.3-1.1) UNRELEASED; urgency=medium
-
-  * Non-maintainer upload.
-  * debian/patches: Fix 01_ayatana.patch:
-    + Adapt INDICATOR_SERVICE_DIR to /usr/share/ayatana/indicators.
-    + Adapt indicator service and .so names in indicator-dialog.c
-    + Use macro HAVE_LIBAYATANA_INDICATOR_INDICATOR_NG_H instead of
-      HAVE_LIBINDICATOR_INDICATOR_NG_H to check that NG indicators are
-      supported.
-
- -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de>  Tue, 20 Mar 2018 20:12:50 +0100
-
 xfce4-indicator-plugin (2.3.3-1) unstable; urgency=medium
 
   [ Evgeni Golov ]
diff -Nru xfce4-indicator-plugin-2.3.3/debian/patches/01_ayatana.patch xfce4-indicator-plugin-2.3.3/debian/patches/01_ayatana.patch
--- xfce4-indicator-plugin-2.3.3/debian/patches/01_ayatana.patch	2018-03-20 19:12:50.000000000 +0000
+++ xfce4-indicator-plugin-2.3.3/debian/patches/01_ayatana.patch	2017-10-15 14:32:43.000000000 +0000
@@ -1,9 +1,11 @@
 Description: Debian doesn't have newer indicators, use the ayatana fork instead.
 Author: Unit 193 <unit193@ubuntu.com>
 
+diff --git a/configure.ac b/configure.ac
+index 588a388..10944da 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -88,8 +88,8 @@
+@@ -88,8 +88,8 @@ XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.9.0])
  XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-2], [4.11.0])
  XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-${LIBXFCE4PANEL_VERSION_API}], [4.11.0])
  XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.6.0])
@@ -14,7 +16,7 @@
  
  dnl ********************************************************************
  dnl *** Check if libindicator has indicator-ng.h headery             ***
-@@ -97,13 +97,13 @@
+@@ -97,13 +97,13 @@ dnl *** At the moment this cannot be derived from the version number ***
  dnl ********************************************************************
  AC_LANG_PUSH([C])
  CPPFLAGS=`$PKG_CONFIG --cflags ${INDICATOR_PKGNAME}`
@@ -30,6 +32,8 @@
  
  dnl ***********************************
  dnl *** Check for debugging support ***
+diff --git a/panel-plugin/indicator-box.c b/panel-plugin/indicator-box.c
+index 66523d6..98d8549 100644
 --- a/panel-plugin/indicator-box.c
 +++ b/panel-plugin/indicator-box.c
 @@ -28,7 +28,7 @@
@@ -41,6 +45,8 @@
  
  #include "indicator-box.h"
  #include "indicator-button.h"
+diff --git a/panel-plugin/indicator-box.h b/panel-plugin/indicator-box.h
+index 8647e04..b5ca139 100644
 --- a/panel-plugin/indicator-box.h
 +++ b/panel-plugin/indicator-box.h
 @@ -20,7 +20,7 @@
@@ -52,6 +58,8 @@
  #include <libxfce4panel/libxfce4panel.h>
  #include "indicator-config.h"
  
+diff --git a/panel-plugin/indicator-button.c b/panel-plugin/indicator-button.c
+index aa89c41..4c26a1a 100644
 --- a/panel-plugin/indicator-button.c
 +++ b/panel-plugin/indicator-button.c
 @@ -28,13 +28,13 @@
@@ -70,6 +78,8 @@
  
  #define ICON_SIZE 22
  #define SPACING 2
+diff --git a/panel-plugin/indicator-button.h b/panel-plugin/indicator-button.h
+index f0f1610..aa2c808 100644
 --- a/panel-plugin/indicator-button.h
 +++ b/panel-plugin/indicator-button.h
 @@ -20,7 +20,7 @@
@@ -81,26 +91,18 @@
  
  #include "indicator-config.h"
  #include "indicator-box.h"
+diff --git a/panel-plugin/indicator.c b/panel-plugin/indicator.c
+index 475e230..4b25c4d 100644
 --- a/panel-plugin/indicator.c
 +++ b/panel-plugin/indicator.c
-@@ -24,7 +24,7 @@
-  */
- 
- 
--#define INDICATOR_SERVICE_DIR "/usr/share/unity/indicators"
-+#define INDICATOR_SERVICE_DIR "/usr/share/ayatana/indicators"
- 
- 
- #ifdef HAVE_CONFIG_H
 @@ -37,9 +37,9 @@
  #include <gtk/gtk.h>
  #include <libxfce4util/libxfce4util.h>
  #include <libxfce4panel/xfce-panel-plugin.h>
 -#include <libindicator/indicator-object.h>
--#ifdef HAVE_LIBINDICATOR_INDICATOR_NG_H
--#include <libindicator/indicator-ng.h>
 +#include <libayatana-indicator/indicator-object.h>
-+#ifdef HAVE_LIBAYATANA_INDICATOR_INDICATOR_NG_H
+ #ifdef HAVE_LIBINDICATOR_INDICATOR_NG_H
+-#include <libindicator/indicator-ng.h>
 +#include <libayatana-indicator/indicator-ng.h>
  #endif
  
@@ -114,79 +116,3 @@
  #endif
  
  /* prototypes */
-@@ -65,7 +65,7 @@
-                                                                     const gchar           *name);
- static gboolean         indicator_load_module                      (IndicatorPlugin       *indicator,
-                                                                     const gchar           *name);
--#ifdef HAVE_LIBINDICATOR_INDICATOR_NG_H
-+#ifdef HAVE_LIBAYATANA_INDICATOR_INDICATOR_NG_H
- static gboolean         indicator_load_service                     (IndicatorPlugin       *indicator,
-                                                                     const gchar           *name);
- static void             indicator_load_services                    (IndicatorPlugin       *indicator);
-@@ -310,7 +310,7 @@
- 
-   /* load 'em */
-   indicator_load_modules (indicator);
--#ifdef HAVE_LIBINDICATOR_INDICATOR_NG_H
-+#ifdef HAVE_LIBAYATANA_INDICATOR_INDICATOR_NG_H
-   indicator_load_services (indicator);
- #endif
- 
-@@ -441,7 +441,7 @@
-   return indicator_load_indicator (indicator, io, name);
- }
- 
--#ifdef HAVE_LIBINDICATOR_INDICATOR_NG_H
-+#ifdef HAVE_LIBAYATANA_INDICATOR_INDICATOR_NG_H
- static gboolean
- indicator_load_service (IndicatorPlugin *indicator,
-                         const gchar     *name)
---- a/panel-plugin/indicator-dialog.c
-+++ b/panel-plugin/indicator-dialog.c
-@@ -54,26 +54,26 @@
- static const gchar *pretty_names[][3] =
- {
-   /* raw name,                           pretty name,                                 icon-name(?) */
--  { "libapplication.so",                 N_("Application Indicators"),               "application-default-icon" },
--  { "libsoundmenu.so",                   N_("Sound Menu"),                           "preferences-desktop-sound" },
--  { "com.canonical.indicator.sound",     N_("Sound Menu"),                           "preferences-desktop-sound" },
--  { "libprintersmenu.so",                N_("Printers Menu"),                        "printer" },
--  { "libpower.so",                       N_("Power Management"),                     NULL },
--  { "com.canonical.indicator.power",     N_("Power Management"),                     NULL },
--  { "libappmenu.so",                     N_("Application Menus (Global Menu)"),      "menu-editor" },
--  { "libsession.so",                     N_("Session Management"),                   NULL },
--  { "com.canonical.indicator.session",   N_("Session Management"),                   NULL },
--  { "libmessaging.so",                   N_("Messaging Menu"),                       "indicator-messages-new" },
--  { "com.canonical.indicator.messages",  N_("Messaging Menu"),                       "indicator-messages-new" },
--  { "libdatetime.so",                    N_("Date and Time"),                        "time-admin" },
--  { "com.canonical.indicator.datetime",  N_("Date and Time"),                        "time-admin" },
--  { "libbluetooth.so",                   N_("Bluetooth"),                            "bluetooth-active" },
--  { "com.canonical.indicator.bluetooth", N_("Bluetooth"),                            "bluetooth-active" },
--  { "libsyncindicator.so",               N_("Sync Menu"),                            "sync-client-updating" },
--  { "com.canonical.indicator.keyboard",  N_("Keyboard"),                             NULL },
--  { "com.canonical.indicator.location",  N_("Location"),                             NULL },
--  { "com.canonical.indicator.network",   N_("Network"),                              NULL },
--  { "libworkrave.so",                    N_("Workrave"),                             "workrave" },
-+  { "libayatana-application.so",         N_("Application Indicators"),               "application-default-icon" },
-+  { "libayatana-soundmenu.so",           N_("Sound Menu"),                           "preferences-desktop-sound" },
-+  { "org.ayatana.indicator.sound",       N_("Sound Menu"),                           "preferences-desktop-sound" },
-+  { "libayatana-printersmenu.so",        N_("Printers Menu"),                        "printer" },
-+  { "libayatana-power.so",               N_("Power Management"),                     NULL },
-+  { "org.ayatana.indicator.power",       N_("Power Management"),                     NULL },
-+  { "libayatana-appmenu.so",             N_("Application Menus (Global Menu)"),      "menu-editor" },
-+  { "libayatana-session.so",             N_("Session Management"),                   NULL },
-+  { "org.ayatana.indicator.session",     N_("Session Management"),                   NULL },
-+  { "libayatana-messaging.so",           N_("Messaging Menu"),                       "indicator-messages-new" },
-+  { "org.ayatana.indicator.messages",    N_("Messaging Menu"),                       "indicator-messages-new" },
-+  { "libayatana-datetime.so",            N_("Date and Time"),                        "time-admin" },
-+  { "org.ayatana.indicator.datetime",    N_("Date and Time"),                        "time-admin" },
-+  { "libayatana-bluetooth.so",           N_("Bluetooth"),                            "bluetooth-active" },
-+  { "org.ayatana.indicator.bluetooth",   N_("Bluetooth"),                            "bluetooth-active" },
-+  { "libayatana-syncindicator.so",       N_("Sync Menu"),                            "sync-client-updating" },
-+  { "org.ayatana.indicator.keyboard",    N_("Keyboard"),                             NULL },
-+  { "org.ayatana.indicator.location",    N_("Location"),                             NULL },
-+  { "org.ayatana.indicator.network",     N_("Network"),                              NULL },
-+  { "libayatana-workrave.so",            N_("Workrave"),                             "workrave" },
- };
- 
- 
