diff --git a/libmarblewidget.spec b/libmarblewidget.spec
index c3c0571..fe4dc81 100644
--- a/libmarblewidget.spec
+++ b/libmarblewidget.spec
@@ -98,6 +98,7 @@ make
 %defattr(-,root,root)
 %doc BUGS CODING
 %{_includedir}/marble/
+%{_includedir}/astro/
 %{_libdir}/libmarblewidget.so
 %{_libdir}/libastro.so
 %{_kde4_appsdir}/cmake/modules/FindMarble.cmake
diff --git a/make_astro_coinstall.diff b/make_astro_coinstall.diff
index 4afb67c..907f55f 100644
--- a/make_astro_coinstall.diff
+++ b/make_astro_coinstall.diff
@@ -1,7 +1,7 @@
-diff -urB marble/CMakeLists.txt new/CMakeLists.txt
---- marble/CMakeLists.txt	2015-10-11 16:02:31.052927316 +0200
-+++ new/CMakeLists.txt	2015-10-11 16:14:01.424573511 +0200
-@@ -100,6 +100,7 @@
+diff -urB marble-15.08.2/CMakeLists.txt new/CMakeLists.txt
+--- marble-15.08.2/CMakeLists.txt	2015-10-02 14:41:37.000000000 +0200
++++ new/CMakeLists.txt	2015-10-11 18:05:32.988227408 +0200
+@@ -121,6 +121,7 @@
    cmake_minimum_required(VERSION 2.8.12)
    set(QT4BUILD FALSE)
    set(MARBLEWIDGET marblewidget-qt5)
@@ -9,7 +9,7 @@ diff -urB marble/CMakeLists.txt new/CMakeLists.txt
  
    include_directories( ${Qt5Svg_INCLUDE_DIRS} )
    include_directories( ${Qt5PrintSupport_INCLUDE_DIRS} )
-@@ -114,6 +115,7 @@
+@@ -135,6 +136,7 @@
    set(WITH_KF5 FALSE)
    set(QT4BUILD TRUE)
    set(MARBLEWIDGET marblewidget)
@@ -17,30 +17,9 @@ diff -urB marble/CMakeLists.txt new/CMakeLists.txt
    find_package(Qt4 REQUIRED)
    set( QT_USE_QTXML         ON )
    set( QT_USE_QTNETWORK     ON )
-diff -urB marble/src/apps/behaim/CMakeLists.txt new/src/apps/behaim/CMakeLists.txt
---- marble/src/apps/behaim/CMakeLists.txt	2015-10-11 16:02:31.312933206 +0200
-+++ new/src/apps/behaim/CMakeLists.txt	2015-10-11 16:26:33.617620798 +0200
-@@ -29,7 +29,7 @@
-       ${Qt5Positioning_LIBRARIES}
-       ${Qt5AndroidExtras_LIBRARIES}
-       ${Qt5Multimedia_LIBRARIES}
--      astro
-+      ${ASTRO}
-       ${MARBLEWIDGET}
-       marbledeclarative)
- 
-@@ -47,7 +47,7 @@
-     set(QT_ANDROID_SDK_ROOT $ENV{ANDROID_SDK})
-     set(QT_ANDROID_NDK_ROOT $ENV{ANDROID_NDK})
-     set(QT_ANDROID_APP_PATH "${ABSOLUTE_INSTALL_PATH}/libs/${ANDROID_ABI}/libMarbleBehaim.so")
--    set(QT_ANDROID_APP_EXTRA_LIBS "${ABSOLUTE_INSTALL_PATH}/lib/libastro.so,${ABSOLUTE_INSTALL_PATH}/lib/libmarblewidget-qt5.so,${ABSOLUTE_INSTALL_PATH}/lib/libmarbledeclarative.so")
-+    set(QT_ANDROID_APP_EXTRA_LIBS "${ABSOLUTE_INSTALL_PATH}/lib/libastro-qt5.so,${ABSOLUTE_INSTALL_PATH}/lib/libmarblewidget-qt5.so,${ABSOLUTE_INSTALL_PATH}/lib/libmarbledeclarative.so")
-     set(QT_ANDROID_APP_PACKAGE_SOURCE_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/package")
-     set(QT_ANDROID_APP_PACKAGE_NAME "org.kde.marble.behaim")
-     set(QT_ANDROID_APP_NAME "Marble Globe: Behaim's Erdapfel")
-diff -urB marble/src/apps/marble-kde/CMakeLists.txt new/src/apps/marble-kde/CMakeLists.txt
---- marble/src/apps/marble-kde/CMakeLists.txt	2015-10-11 16:02:31.312933206 +0200
-+++ new/src/apps/marble-kde/CMakeLists.txt	2015-10-11 16:26:09.313069972 +0200
+diff -urB marble-15.08.2/src/apps/marble-kde/CMakeLists.txt new/src/apps/marble-kde/CMakeLists.txt
+--- marble-15.08.2/src/apps/marble-kde/CMakeLists.txt	2015-10-02 14:41:37.000000000 +0200
++++ new/src/apps/marble-kde/CMakeLists.txt	2015-10-11 18:05:32.988227408 +0200
 @@ -54,7 +54,7 @@
      marble
      marbleui
@@ -50,30 +29,30 @@ diff -urB marble/src/apps/marble-kde/CMakeLists.txt new/src/apps/marble-kde/CMak
      KF5::NewStuff
      KF5::Wallet
      KF5::Parts
-diff -urB marble/src/apps/marble-maps/CMakeLists.txt new/src/apps/marble-maps/CMakeLists.txt
---- marble/src/apps/marble-maps/CMakeLists.txt	2015-10-11 16:02:31.312933206 +0200
-+++ new/src/apps/marble-maps/CMakeLists.txt	2015-10-11 16:25:56.024768817 +0200
-@@ -29,7 +29,7 @@
-       ${Qt5Positioning_LIBRARIES}
-       ${Qt5AndroidExtras_LIBRARIES}
-       ${Qt5Multimedia_LIBRARIES}
--      astro
-+      ${ASTRO}
+diff -urB marble-15.08.2/src/apps/marble_maps/CMakeLists.txt new/src/apps/marble_maps/CMakeLists.txt
+--- marble-15.08.2/src/apps/marble_maps/CMakeLists.txt	2015-10-02 14:41:37.000000000 +0200
++++ new/src/apps/marble_maps/CMakeLists.txt	2015-10-11 18:06:50.981995015 +0200
+@@ -14,7 +14,7 @@
+       ${Qt5WebKitWidgets_LIBRARIES}
+       ${Qt5WebKit_LIBRARIES}
        ${MARBLEWIDGET}
-       marbledeclarative)
+-      astro)
++      ${ASTRO})
+     
+ file(COPY "../../../data" DESTINATION "${CMAKE_BINARY_DIR}/src/apps/marble_maps/assets")
+ file(COPY "../../../data/android/drawable-ldpi" DESTINATION "${CMAKE_BINARY_DIR}/src/apps/marble_maps/res")
+@@ -32,7 +32,7 @@
+     PACKAGE_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/package"
+     PACKAGE_NAME org.kde.marble.maps
+     ${KEYSTORE_OPTIONS}
+-    DEPENDS "${PROJECT_BINARY_DIR}/lib/libmarblewidget-qt5.so" "${PROJECT_BINARY_DIR}/lib/libastro.so"
++    DEPENDS "${PROJECT_BINARY_DIR}/lib/libmarblewidget-qt5.so" "${PROJECT_BINARY_DIR}/lib/libastro-qt5.so"
+ )
  
-@@ -47,7 +47,7 @@
-     set(QT_ANDROID_SDK_ROOT $ENV{ANDROID_SDK})
-     set(QT_ANDROID_NDK_ROOT $ENV{ANDROID_NDK})
-     set(QT_ANDROID_APP_PATH "${ABSOLUTE_INSTALL_PATH}/libs/${ANDROID_ABI}/libMarble.so")
--    set(QT_ANDROID_APP_EXTRA_LIBS "${ABSOLUTE_INSTALL_PATH}/lib/libastro.so,${ABSOLUTE_INSTALL_PATH}/lib/libmarblewidget-qt5.so,${ABSOLUTE_INSTALL_PATH}/lib/libmarbledeclarative.so")
-+    set(QT_ANDROID_APP_EXTRA_LIBS "${ABSOLUTE_INSTALL_PATH}/lib/libastro-qt5.so,${ABSOLUTE_INSTALL_PATH}/lib/libmarblewidget-qt5.so,${ABSOLUTE_INSTALL_PATH}/lib/libmarbledeclarative.so")
-     set(QT_ANDROID_APP_PACKAGE_SOURCE_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/package")
-     set(QT_ANDROID_APP_PACKAGE_NAME "org.kde.marble.maps")
-     set(QT_ANDROID_APP_NAME "Marble Maps")
-diff -urB marble/src/apps/marble-qt/CMakeLists.txt new/src/apps/marble-qt/CMakeLists.txt
---- marble/src/apps/marble-qt/CMakeLists.txt	2015-10-11 16:02:31.312933206 +0200
-+++ new/src/apps/marble-qt/CMakeLists.txt	2015-10-11 16:26:59.470206705 +0200
+ # Move target from default build to install phase so we can create everything in one go
+diff -urB marble-15.08.2/src/apps/marble-qt/CMakeLists.txt new/src/apps/marble-qt/CMakeLists.txt
+--- marble-15.08.2/src/apps/marble-qt/CMakeLists.txt	2015-10-02 14:41:37.000000000 +0200
++++ new/src/apps/marble-qt/CMakeLists.txt	2015-10-11 18:05:32.988227408 +0200
 @@ -40,7 +40,7 @@
      ${QT_QTDBUS_LIBRARY}
      marbleui
@@ -92,10 +71,10 @@ diff -urB marble/src/apps/marble-qt/CMakeLists.txt new/src/apps/marble-qt/CMakeL
  endif()
  
  if(WIN32)
-diff -urB marble/src/lib/astro/CMakeLists.txt new/src/lib/astro/CMakeLists.txt
---- marble/src/lib/astro/CMakeLists.txt	2015-10-11 16:02:31.324933478 +0200
-+++ new/src/lib/astro/CMakeLists.txt	2015-10-11 16:18:09.918205232 +0200
-@@ -22,27 +22,27 @@
+diff -urB marble-15.08.2/src/lib/astro/CMakeLists.txt new/src/lib/astro/CMakeLists.txt
+--- marble-15.08.2/src/lib/astro/CMakeLists.txt	2015-10-02 14:41:37.000000000 +0200
++++ new/src/lib/astro/CMakeLists.txt	2015-10-11 18:08:05.239677950 +0200
+@@ -20,23 +20,23 @@
    solarsystem.cpp
  )
  
@@ -121,15 +100,10 @@ diff -urB marble/src/lib/astro/CMakeLists.txt new/src/lib/astro/CMakeLists.txt
  
 -SET_TARGET_PROPERTIES(astro PROPERTIES
 +SET_TARGET_PROPERTIES(${ASTRO} PROPERTIES
-     DEFINE_SYMBOL MAKE_ASTRO_LIB            # needed for astrolib_export.h
-   )
- if(NOT CMAKE_SYSTEM_NAME STREQUAL Android)
--  SET_TARGET_PROPERTIES(astro PROPERTIES
-+  SET_TARGET_PROPERTIES(${ASTRO} PROPERTIES
-     VERSION ${GENERIC_LIB_VERSION}
-     SOVERSION ${GENERIC_LIB_SOVERSION}
-   )
-@@ -50,11 +50,11 @@
+   VERSION ${GENERIC_LIB_VERSION}
+   SOVERSION ${GENERIC_LIB_SOVERSION}
+   DEFINE_SYMBOL MAKE_ASTRO_LIB            # needed for astrolib_export.h
+@@ -44,11 +44,11 @@
  
  # choose the correct target install library path
  if(WIN32)
@@ -144,9 +118,9 @@ diff -urB marble/src/lib/astro/CMakeLists.txt new/src/lib/astro/CMakeLists.txt
  endif()
  
  ########### install files ###############
-diff -urB marble/src/lib/marble/CMakeLists.txt new/src/lib/marble/CMakeLists.txt
---- marble/src/lib/marble/CMakeLists.txt	2015-10-11 16:02:31.328933569 +0200
-+++ new/src/lib/marble/CMakeLists.txt	2015-10-11 16:13:31.491895133 +0200
+diff -urB marble-15.08.2/src/lib/marble/CMakeLists.txt new/src/lib/marble/CMakeLists.txt
+--- marble-15.08.2/src/lib/marble/CMakeLists.txt	2015-10-02 14:41:37.000000000 +0200
++++ new/src/lib/marble/CMakeLists.txt	2015-10-11 18:05:32.988227408 +0200
 @@ -372,7 +372,7 @@
  ADD_LIBRARY(${MARBLEWIDGET} SHARED ${marblewidget_SRCS} ${SOURCES_UI_HDRS})
  
@@ -154,38 +128,38 @@ diff -urB marble/src/lib/marble/CMakeLists.txt new/src/lib/marble/CMakeLists.txt
 -TARGET_LINK_LIBRARIES (${MARBLEWIDGET} astro)
 +TARGET_LINK_LIBRARIES (${MARBLEWIDGET} ${ASTRO})
  
- # link against zlib
- TARGET_LINK_LIBRARIES (${MARBLEWIDGET} ${ZLIB_LIBRARIES})
-diff -urB marble/src/plugins/render/eclipses/CMakeLists.txt new/src/plugins/render/eclipses/CMakeLists.txt
---- marble/src/plugins/render/eclipses/CMakeLists.txt	2015-10-11 16:02:31.388934928 +0200
-+++ new/src/plugins/render/eclipses/CMakeLists.txt	2015-10-11 16:21:07.418228001 +0200
+ # link with release version of Qt libs
+ if( QT4BUILD )
+diff -urB marble-15.08.2/src/plugins/render/eclipses/CMakeLists.txt new/src/plugins/render/eclipses/CMakeLists.txt
+--- marble-15.08.2/src/plugins/render/eclipses/CMakeLists.txt	2015-10-02 14:41:37.000000000 +0200
++++ new/src/plugins/render/eclipses/CMakeLists.txt	2015-10-11 18:05:32.988227408 +0200
 @@ -26,4 +26,4 @@
  
  marble_add_plugin( EclipsesPlugin ${eclipses_SRCS} )
  
 -target_link_libraries( EclipsesPlugin astro )
 +target_link_libraries( EclipsesPlugin ${ASTRO} )
-diff -urB marble/src/plugins/render/satellites/CMakeLists.txt new/src/plugins/render/satellites/CMakeLists.txt
---- marble/src/plugins/render/satellites/CMakeLists.txt	2015-10-11 16:02:31.392935019 +0200
-+++ new/src/plugins/render/satellites/CMakeLists.txt	2015-10-11 16:20:45.561732650 +0200
-@@ -33,4 +33,4 @@
+diff -urB marble-15.08.2/src/plugins/render/satellites/CMakeLists.txt new/src/plugins/render/satellites/CMakeLists.txt
+--- marble-15.08.2/src/plugins/render/satellites/CMakeLists.txt	2015-10-02 14:41:37.000000000 +0200
++++ new/src/plugins/render/satellites/CMakeLists.txt	2015-10-11 18:08:39.680458497 +0200
+@@ -37,4 +37,4 @@
   ${satellites_SRCS}
   ${sgp4_SRCS} )
  
--target_link_libraries( SatellitesPlugin astro sgp4 )
-+target_link_libraries( SatellitesPlugin ${ASTRO} sgp4 )
-diff -urB marble/src/plugins/render/stars/CMakeLists.txt new/src/plugins/render/stars/CMakeLists.txt
---- marble/src/plugins/render/stars/CMakeLists.txt	2015-10-11 16:02:31.396935110 +0200
-+++ new/src/plugins/render/stars/CMakeLists.txt	2015-10-11 16:21:24.314610924 +0200
+-target_link_libraries( SatellitesPlugin astro )
++target_link_libraries( SatellitesPlugin ${ASTRO} )
+diff -urB marble-15.08.2/src/plugins/render/stars/CMakeLists.txt new/src/plugins/render/stars/CMakeLists.txt
+--- marble-15.08.2/src/plugins/render/stars/CMakeLists.txt	2015-10-02 14:41:37.000000000 +0200
++++ new/src/plugins/render/stars/CMakeLists.txt	2015-10-11 18:05:32.988227408 +0200
 @@ -16,4 +16,4 @@
  qt_wrap_ui(stars_SRCS  ${stars_UI})
  
  marble_add_plugin( StarsPlugin ${stars_SRCS} )
 -target_link_libraries( StarsPlugin astro )
 +target_link_libraries( StarsPlugin ${ASTRO} )
-diff -urB marble/tools/osm-sisyphus/CMakeLists.txt new/tools/osm-sisyphus/CMakeLists.txt
---- marble/tools/osm-sisyphus/CMakeLists.txt	2015-10-11 16:02:31.420935653 +0200
-+++ new/tools/osm-sisyphus/CMakeLists.txt	2015-10-11 16:30:57.359598099 +0200
+diff -urB marble-15.08.2/tools/osm-sisyphus/CMakeLists.txt new/tools/osm-sisyphus/CMakeLists.txt
+--- marble-15.08.2/tools/osm-sisyphus/CMakeLists.txt	2015-10-02 14:41:37.000000000 +0200
++++ new/tools/osm-sisyphus/CMakeLists.txt	2015-10-11 18:05:32.988227408 +0200
 @@ -24,7 +24,7 @@
  add_executable( ${TARGET} ${${TARGET}_SRC} )