diff --git a/3rdparty/poppler/git/CairoOutputDev.cc b/3rdparty/poppler/git/CairoOutputDev.cc
index aa4f1cc..846c81a 100644
--- a/3rdparty/poppler/git/CairoOutputDev.cc
+++ b/3rdparty/poppler/git/CairoOutputDev.cc
@@ -31,6 +31,7 @@
 // Copyright (C) 2015 Suzuki Toshiya <mpsuzuki@hiroshima-u.ac.jp>
 // Copyright (C) 2018 Klarälvdalens Datakonsult AB, a KDAB Group company, <info@kdab.com>. Work sponsored by the LiMux project of the city of Munich
 // Copyright (C) 2018 Adam Reichold <adam.reichold@t-online.de>
+// Copyright (C) 2019 Marek Kasik <mkasik@redhat.com>
 //
 // To see a description of the changes please see the Changelog file that
 // came with your tarball or type make ChangeLog if you are building from git
@@ -3134,6 +3135,13 @@ public:
 	  scaledWidth = MAX_PRINT_IMAGE_SIZE * (double)width/height;
 	}
 	needsCustomDownscaling = true;
+
+        if (scaledWidth == 0) {
+          scaledWidth = 1;
+        }
+        if (scaledHeight == 0) {
+          scaledHeight = 1;
+        }
       } else {
 	needsCustomDownscaling = false;
       }
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4378706..3852c22 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,7 +10,7 @@ option(ENABLE_SVG "Enable SVG support, for generating SVG background images and
 
 include_directories(${CMAKE_SOURCE_DIR}/src)
 
-set(PDF2HTMLEX_VERSION "0.18.6")
+set(PDF2HTMLEX_VERSION "0.18.7")
 set(ARCHIVE_NAME pdf2htmlex-${PDF2HTMLEX_VERSION})
 add_custom_target(dist
     COMMAND git archive --prefix=${ARCHIVE_NAME}/ HEAD
diff --git a/PopplerReleases.md b/PopplerReleases.md
index 7dec12a..149dc29 100644
--- a/PopplerReleases.md
+++ b/PopplerReleases.md
@@ -5,7 +5,7 @@ This table lists the (recent) pdf2htmlEX releases which work for a given
 
 |     poppler    | pdf2htmlEX |
 |----------------|------------|
-| poppler-0.81.0 | unknown |
+| poppler-0.81.0 | v0.18.7-poppler-0.81.0 |
 | poppler-0.80.0 | v0.18.6-poppler-0.80.0 |
 | poppler-0.79.0 | v0.18.5-poppler-0.79.0 |
 | poppler-0.78.0 | v0.18.4-poppler-0.78.0 |