diff -Nru openipmi-2.0.25/debian/changelog openipmi-2.0.25/debian/changelog
--- openipmi-2.0.25/debian/changelog	2018-06-17 12:02:26.000000000 +0000
+++ openipmi-2.0.25/debian/changelog	2019-04-07 19:24:31.000000000 +0000
@@ -1,3 +1,21 @@
+openipmi (2.0.25-2.1ubuntu1) disco; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - debian/patches/fix_pthread_pkg_config.patch: fix pkg-config files:
+      pthread.pc does not exist in Ubuntu.  Thanks to Simon McVittie
+      <smcv@debian.org>.  Closes #474087, LP #1311888.
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Sun, 07 Apr 2019 21:24:31 +0200
+
+openipmi (2.0.25-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload, with pre-approval from current maintainer.
+  * Increase MAX_CONFIG_LINE from 1024 to 10240, patching
+    lanserv/OpenIPMI/serv.h, which makes it possible to have long enough
+    command line when using ipmi_sim (Closes: #923873).
+
+ -- Thomas Goirand <zigo@debian.org>  Wed, 27 Mar 2019 22:57:19 +0100
+
 openipmi (2.0.25-2ubuntu1) cosmic; urgency=medium
 
   * Merge with Debian; remaining changes:
@@ -288,8 +306,8 @@
 
 openipmi (2.0.16-1) unstable; urgency=low
 
-  * new upstream  release from 2009-03-16
-  * debian/compat, debian/control, raised to debhelper 5
+  * new upstream release from 2009-03-16
+  * debian/compat debian/control raised to debhelper 5
   * debian/control removed URL in description new we
     have the Homepage: field
   * debian/control updated Standards-Version: (no changes needed)
diff -Nru openipmi-2.0.25/debian/patches/increase-MAX_CONFIG_LINE.patch openipmi-2.0.25/debian/patches/increase-MAX_CONFIG_LINE.patch
--- openipmi-2.0.25/debian/patches/increase-MAX_CONFIG_LINE.patch	1970-01-01 00:00:00.000000000 +0000
+++ openipmi-2.0.25/debian/patches/increase-MAX_CONFIG_LINE.patch	2019-03-27 21:57:19.000000000 +0000
@@ -0,0 +1,20 @@
+Description: Increase MAX_CONFIG_LINE
+ The parser of OpenIPMI's ipmi_sim is limited in the size of the command
+ line that we can pass to a VM. This fixes the issue, and probably at
+ other places where OpenIPMI is using the parser.
+Author: Thomas Goirand <zigo@debian.org>
+Bug-Debian: https://bugs.debian.org/923873
+Forwarded: no
+Last-Update: 2019-03-27
+
+--- openipmi-2.0.25.orig/lanserv/OpenIPMI/serv.h
++++ openipmi-2.0.25/lanserv/OpenIPMI/serv.h
+@@ -474,7 +474,7 @@ int chan_init(channel_t *chan);
+ void sysinfo_init(sys_data_t *sys);
+ 
+ 
+-#define MAX_CONFIG_LINE 1024
++#define MAX_CONFIG_LINE 10240
+ 
+ const char *mystrtok(char *str, const char *delim, char **next);
+ 
diff -Nru openipmi-2.0.25/debian/patches/series openipmi-2.0.25/debian/patches/series
--- openipmi-2.0.25/debian/patches/series	2018-06-17 12:02:26.000000000 +0000
+++ openipmi-2.0.25/debian/patches/series	2019-04-07 19:24:31.000000000 +0000
@@ -1 +1,2 @@
+increase-MAX_CONFIG_LINE.patch
 fix_pthread_pkg_config.patch