diff --git a/tiled-1.0.3.tar.gz b/tiled-1.0.3.tar.gz
deleted file mode 100644
index e495feb..0000000
--- a/tiled-1.0.3.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3d0665bd988a877b7156842daeddd91fa17b1b473d2e5ebf8a62ffe2c9a047e2
-size 6601791
diff --git a/tiled-1.1.0-empty-return.patch b/tiled-1.1.0-empty-return.patch
new file mode 100644
index 0000000..43f3d76
--- /dev/null
+++ b/tiled-1.1.0-empty-return.patch
@@ -0,0 +1,11 @@
+diff -urEbwB tiled-1.1.0/src/libtiled/tileset.cpp tiled-1.1.0.new/src/libtiled/tileset.cpp
+--- tiled-1.1.0/src/libtiled/tileset.cpp	2018-01-03 11:57:44.000000000 +0100
++++ tiled-1.1.0.new/src/libtiled/tileset.cpp	2018-01-04 12:00:09.806029317 +0100
+@@ -786,6 +786,7 @@
+     case Tileset::Isometric:
+         return QLatin1String("isometric");
+     }
++    return QString();
+ }
+ 
+ Tileset::Orientation Tileset::orientationFromString(const QString &string)
diff --git a/tiled-1.1.0.tar.gz b/tiled-1.1.0.tar.gz
new file mode 100644
index 0000000..9049197
--- /dev/null
+++ b/tiled-1.1.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e8eebd95489ee94545d9b36188261b80205a702fe0c2a0765b578ce87bf1bbf7
+size 15963801
diff --git a/tiled.changes b/tiled.changes
index 0b721e2..81cbdcf 100644
--- a/tiled.changes
+++ b/tiled.changes
@@ -1,3 +1,35 @@
+-------------------------------------------------------------------
+Thu Jan  4 11:09:08 UTC 2018 - mvetter@suse.com
+
+- Update to 1.1.0:
+  * Added support for infinite maps (by Ketan Gupta, #260)
+  * Added support for Wang tiles and related tools (by Benjamin Trotter)
+  * Added support for reusable object templates (by Mohamed Thabet)
+  * Added icon for animation editor in the tileset editor (by Ketan Gupta, #1706)
+  * Added ability to reorder terrain types (by Justin Jacobs, #1603)
+  * Added support for custom input formats and TMX output to the --export-map command-line option
+  * Added island RPG example based on Beach tileset by finalbossblues
+  * Added file-related context menu actions to tileset tabs
+  * Added support for exporting tilesets, including to Lua format (by Conrad Mercer, #1213)
+  * Improved polygon node handles and drag behavior
+  * Fixed %executablepath variable for executables found in PATH (#1648)
+  * Fixed Delete key to delete selected polygon nodes when appropriate (by Ketan Gupta, #1555)
+  * Fixed crash when saving two new maps using the same file name (#1734)
+  * Fixed selection rectangle's shadow offset when zooming (by Antoine Gersant, #1796)
+  * Fixed potential crash after deleting object or group layers
+  * Automapping: Don't fail if an input/inputnot layer isn't found
+  * Automapping: Added a "StrictEmpty" flag to input layers
+  * GMX plugin: Added support for defining views with objects (by William Taylor, #1621)
+  * GMX plugin: Start counting default tile layer depth from 1000000 (#1814)
+  * tBIN plugin: Added read/write support for the tBIN map format (by Chase Warrington, #1560)
+  * libtiled-java: Generate classes from XSD, some fixes and build with Maven (by Mike Thomas, #1637)
+  * libtiled-java: Added support for manipulating non-consecutive tile IDs in a tileset (by Stéphane Seng)
+  * Python plugin: Adjusted example scripts to API changes (by spiiin, #1769)
+  *  plugin: Various changes (by Justin Jacobs, #1781)
+  * TMW plugin: Removed since it is no longer needed
+  * Updated translations
+- Add tiled-1.1.0-empty-return.patch: Fix 'Program returns random data in a function'
+
 -------------------------------------------------------------------
 Tue Aug 29 14:06:11 UTC 2017 - mvetter@suse.com
 
diff --git a/tiled.spec b/tiled.spec
index 127b7a9..137ac98 100644
--- a/tiled.spec
+++ b/tiled.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package tiled
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,13 +17,15 @@
 
 
 Name:           tiled
-Version:        1.0.3
+Version:        1.1.0
 Release:        0
 Summary:        A tilemap editor
 License:        GPL-2.0+
 Group:          Productivity/Graphics/Other
 Url:            http://www.mapeditor.org
 Source:         https://github.com/bjorn/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz
+# FIX-UPSTREAM - jubahl@iodoru.org - https://github.com/bjorn/tiled/pull/1846
+Patch0:         tiled-1.1.0-empty-return.patch
 BuildRequires:  desktop-file-utils
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
@@ -61,6 +63,7 @@ This package contains libtiled a library for the Tiled map editor.
 
 %prep
 %setup -q
+%patch0 -p1
 # Remove copy of zlib
 rm -rf src/zlib
 
@@ -89,6 +92,8 @@ install -Dm0644 tiled.appdata.xml %{buildroot}%{_datadir}/appdata/tiled.appdata.
 
 %post -n libtiled1 -p /sbin/ldconfig
 %postun -n libtiled1 -p /sbin/ldconfig
+
+%if 0%{?suse_version} > 1130
 %post
 %desktop_database_post
 %icon_theme_cache_post
@@ -98,6 +103,7 @@ install -Dm0644 tiled.appdata.xml %{buildroot}%{_datadir}/appdata/tiled.appdata.
 %desktop_database_postun
 %icon_theme_cache_postun
 %mime_database_postun
+%endif
 
 %files -f %{name}.lang
 %doc AUTHORS NEWS.md README.md COPYING LICENSE.GPL LICENSE.BSD