diff --git a/qucs-activefilter/CMakeLists.txt b/qucs-activefilter/CMakeLists.txt
index 8d89ec8d..9d89325c 100644
--- a/qucs-activefilter/CMakeLists.txt
+++ b/qucs-activefilter/CMakeLists.txt
@@ -103,5 +103,7 @@ INSTALL(TARGETS ${QUCS_NAME}activefilter
     )
 
 # man pages
+IF(NOT WITH_SPICE)
 INSTALL( FILES qucsactivefilter.1 DESTINATION share/man/man1 )
+ENDIF()
 
diff --git a/qucs-attenuator/CMakeLists.txt b/qucs-attenuator/CMakeLists.txt
index 3466ebac..a1797ed0 100644
--- a/qucs-attenuator/CMakeLists.txt
+++ b/qucs-attenuator/CMakeLists.txt
@@ -104,7 +104,9 @@ INSTALL(TARGETS ${PROJECT_NAME}
     )
 
 # man pages
+IF(NOT WITH_SPICE)
 INSTALL( FILES qucsattenuator.1 DESTINATION share/man/man1 )
+ENDIF()
 
 
 #
diff --git a/qucs-edit/CMakeLists.txt b/qucs-edit/CMakeLists.txt
index 4d24714d..d1568f6e 100644
--- a/qucs-edit/CMakeLists.txt
+++ b/qucs-edit/CMakeLists.txt
@@ -79,4 +79,6 @@ INSTALL(TARGETS qucsedit
     RUNTIME DESTINATION bin COMPONENT Runtime
     )
 
+IF(NOT WITH_SPICE)
 INSTALL(FILES qucsedit.1 DESTINATION share/man/man1)
+ENDIF()
diff --git a/qucs-filter/CMakeLists.txt b/qucs-filter/CMakeLists.txt
index e128d537..77d4e606 100644
--- a/qucs-filter/CMakeLists.txt
+++ b/qucs-filter/CMakeLists.txt
@@ -124,5 +124,6 @@ INSTALL(TARGETS ${QUCS_NAME}filter
     )
 
 # man pages
+IF(NOT WITH_SPICE)
 INSTALL( FILES qucsfilter.1 DESTINATION share/man/man1 )
-
+ENDIF()
diff --git a/qucs-help/CMakeLists.txt b/qucs-help/CMakeLists.txt
index a93ef8d9..8729f10d 100644
--- a/qucs-help/CMakeLists.txt
+++ b/qucs-help/CMakeLists.txt
@@ -96,6 +96,9 @@ INSTALL(TARGETS qucshelp
     )
 
 # man pages
+IF(WITH_SPICE)
+INSTALL( FILES ./docs/${QUCS_NAME}.1 DESTINATION share/man/man1 )
+ELSE()
 INSTALL( FILES qucshelp.1           DESTINATION share/man/man1 )
 INSTALL( FILES ./docs/qucs.1        DESTINATION share/man/man1 )
 INSTALL( FILES ./docs/qucsdigi.1    DESTINATION share/man/man1 )
diff --git a/qucs-help/docs/qucs-s.1 b/qucs-help/docs/qucs-s.1
new file mode 100644
index 00000000..81beb9af
--- /dev/null
+++ b/qucs-help/docs/qucs-s.1
@@ -0,0 +1,34 @@
+.TH Qucs-S "1" "June 2016" "Debian/GNU Linux" "User Commands"
+.SH NAME
+Qucs-S \- An universal GUI for SPICE and not-SPICE circuit simulators
+.SH SYNOPSIS
+.B qucs-s
+[\fIOPTION\fR] ...
+.SH DESCRIPTION
+
+\fBQucs-S\fR is an unversal tool that provides GUI for different SPICE and 
+not-SPICE circuit simulators. The following SPICE simulators are supported:
+Ngspice, XYCE, and SpiceOpus. Also it allows to use not-SPICE simulation 
+kernel Qucsator as simulation backends.
+
+ 
+.SH AVAILABILITY
+The latest version of Qucs-S can always be obtained from
+\fBwww.sourceforge.net\fR or \fBwww.freshmeat.net\fR
+.SH "REPORTING BUGS"
+Known bugs are documented within the BUGS file.  Report bugs to
+<qucs-bugs@lists.sourceforge.net>.
+.SH COPYRIGHT
+Copyright \(co 2015-2016 Vadim Kuznetsov <ra3xdh@gmail.com>, and Mike Brinson 
+<mbrin72043@yahoo.co.uk>
+
+Based on original Qucs code by M. Margraf, S. Jahn, G.B. Torri, et al.
+.PP
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+.SH AUTHORS
+SPICE support written by 2015-2016 Vadim Kuznetsov <ra3xdh@gmail.com>, 
+and Mike Brinson <mbrin72043@yahoo.co.uk>
+
+Based on original Qucs code by M. Margraf, S. Jahn, G.B. Torri, et al.
+
diff --git a/qucs-lib/CMakeLists.txt b/qucs-lib/CMakeLists.txt
index c7ccd2a0..1f06bab4 100644
--- a/qucs-lib/CMakeLists.txt
+++ b/qucs-lib/CMakeLists.txt
@@ -93,5 +93,7 @@ INSTALL(TARGETS ${QUCS_NAME}lib
 ADD_SUBDIRECTORY( library )
 
 # man pages
+IF(NOT WITH_SPICE)
 INSTALL( FILES qucslib.1 DESTINATION share/man/man1 )
+ENDIF()
 
diff --git a/qucs-rescodes/CMakeLists.txt b/qucs-rescodes/CMakeLists.txt
index e62d21f3..6fecac2c 100644
--- a/qucs-rescodes/CMakeLists.txt
+++ b/qucs-rescodes/CMakeLists.txt
@@ -95,6 +95,8 @@ INSTALL(TARGETS qucsrescodes
     )
 
 # man pages
+IF(NOT WITH_SPICE)
 INSTALL( FILES qucsrescodes.1 DESTINATION share/man/man1 )
+ENDIF()
 
 
diff --git a/qucs-transcalc/CMakeLists.txt b/qucs-transcalc/CMakeLists.txt
index b3410c94..f4e99d28 100644
--- a/qucs-transcalc/CMakeLists.txt
+++ b/qucs-transcalc/CMakeLists.txt
@@ -112,7 +112,9 @@ TARGET_LINK_LIBRARIES( qucstrans ${QT_LIBRARIES} transcalc )
 #ADD_SUBDIRECTORY( bitmaps ) -> added as resources
 ADD_SUBDIRECTORY( examples )
 
+IF(NOT WITH_SPICE)
 INSTALL( FILES qucstrans.1 DESTINATION share/man/man1 )
+ENDIF()
 
 #
 # Prepare the installation
diff --git a/qucs/CMakeLists.txt b/qucs/CMakeLists.txt
index f4687851..b0000127 100755
--- a/qucs/CMakeLists.txt
+++ b/qucs/CMakeLists.txt
@@ -188,15 +188,15 @@ QT4_ADD_RESOURCES(RESOURCES_SRCS ${RESOURCES})
 
 if(UNIX AND NOT APPLE)
 
-    SET(ICON16 bitmaps/hicolor/16x16/apps/qucs.png )
-    SET(ICON22 bitmaps/hicolor/22x22/apps/qucs.png )
-    SET(ICON32 bitmaps/hicolor/32x32/apps/qucs.png )
-    SET(ICON48 bitmaps/hicolor/48x48/apps/qucs.png )
-    SET(ICON64 bitmaps/hicolor/64x64/apps/qucs.png )
-    SET(ICON128 bitmaps/hicolor/128x128/apps/qucs.png )
-    SET(ICON256 bitmaps/hicolor/256x256/apps/qucs.png )
-    SET(ICON512 bitmaps/hicolor/512x512/apps/qucs.png )
-    SET(ICONsc bitmaps/hicolor/scalable/apps/qucs.svg )
+    SET(ICON16 bitmaps/hicolor/16x16/apps/${QUCS_NAME}.png )
+    SET(ICON22 bitmaps/hicolor/22x22/apps/${QUCS_NAME}.png )
+    SET(ICON32 bitmaps/hicolor/32x32/apps/${QUCS_NAME}.png )
+    SET(ICON48 bitmaps/hicolor/48x48/apps/${QUCS_NAME}.png )
+    SET(ICON64 bitmaps/hicolor/64x64/apps/${QUCS_NAME}.png )
+    SET(ICON128 bitmaps/hicolor/128x128/apps/${QUCS_NAME}.png )
+    SET(ICON256 bitmaps/hicolor/256x256/apps/${QUCS_NAME}.png )
+    SET(ICON512 bitmaps/hicolor/512x512/apps/${QUCS_NAME}.png )
+    SET(ICONsc bitmaps/hicolor/scalable/apps/${QUCS_NAME}.svg )
 
     INSTALL( FILES ${ICON16} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/16x16/apps)
     INSTALL( FILES ${ICON22} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/22x22/apps)
@@ -208,7 +208,7 @@ if(UNIX AND NOT APPLE)
     INSTALL( FILES ${ICON512} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/512x512/apps)
     INSTALL( FILES ${ICONsc} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/scalable/apps)
 
-    SET(DESKTOP qucs.desktop )
+    SET(DESKTOP ${QUCS_NAME}.desktop )
     INSTALL( FILES ${DESKTOP} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications)
 endif()
 
diff --git a/qucs/bitmaps/hicolor/128x128/apps/qucs-s.png b/qucs/bitmaps/hicolor/128x128/apps/qucs-s.png
new file mode 100644
index 00000000..6c18bd4f
Binary files /dev/null and b/qucs/bitmaps/hicolor/128x128/apps/qucs-s.png differ
diff --git a/qucs/bitmaps/hicolor/16x16/apps/qucs-s.png b/qucs/bitmaps/hicolor/16x16/apps/qucs-s.png
new file mode 100644
index 00000000..158cdc42
Binary files /dev/null and b/qucs/bitmaps/hicolor/16x16/apps/qucs-s.png differ
diff --git a/qucs/bitmaps/hicolor/22x22/apps/qucs-s.png b/qucs/bitmaps/hicolor/22x22/apps/qucs-s.png
new file mode 100644
index 00000000..2c86241e
Binary files /dev/null and b/qucs/bitmaps/hicolor/22x22/apps/qucs-s.png differ
diff --git a/qucs/bitmaps/hicolor/256x256/apps/qucs-s.png b/qucs/bitmaps/hicolor/256x256/apps/qucs-s.png
new file mode 100644
index 00000000..1c8d8ddb
Binary files /dev/null and b/qucs/bitmaps/hicolor/256x256/apps/qucs-s.png differ
diff --git a/qucs/bitmaps/hicolor/32x32/apps/qucs-s.png b/qucs/bitmaps/hicolor/32x32/apps/qucs-s.png
new file mode 100644
index 00000000..5d3a5f04
Binary files /dev/null and b/qucs/bitmaps/hicolor/32x32/apps/qucs-s.png differ
diff --git a/qucs/bitmaps/hicolor/48x48/apps/qucs-s.png b/qucs/bitmaps/hicolor/48x48/apps/qucs-s.png
new file mode 100644
index 00000000..77429cde
Binary files /dev/null and b/qucs/bitmaps/hicolor/48x48/apps/qucs-s.png differ
diff --git a/qucs/bitmaps/hicolor/512x512/apps/qucs-s.png b/qucs/bitmaps/hicolor/512x512/apps/qucs-s.png
new file mode 100644
index 00000000..db8d3c32
Binary files /dev/null and b/qucs/bitmaps/hicolor/512x512/apps/qucs-s.png differ
diff --git a/qucs/bitmaps/hicolor/64x64/apps/qucs-s.png b/qucs/bitmaps/hicolor/64x64/apps/qucs-s.png
new file mode 100644
index 00000000..efc81921
Binary files /dev/null and b/qucs/bitmaps/hicolor/64x64/apps/qucs-s.png differ
diff --git a/qucs/bitmaps/hicolor/scalable/apps/qucs-s.svg b/qucs/bitmaps/hicolor/scalable/apps/qucs-s.svg
new file mode 100644
index 00000000..b4f56394
--- /dev/null
+++ b/qucs/bitmaps/hicolor/scalable/apps/qucs-s.svg
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="128.00145"
+   height="128.08"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="Nowy dokument 1">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2.8"
+     inkscape:cx="93.240312"
+     inkscape:cy="79.175496"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1280"
+     inkscape:window-height="971"
+     inkscape:window-x="-4"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-263.59791,-223.28557)">
+    <g
+       id="g3958">
+      <rect
+         ry="24.56002"
+         y="225.71243"
+         x="266.02008"
+         height="123.23098"
+         width="123.15714"
+         id="rect3131"
+         style="fill:#ff9900;fill-opacity:1;stroke:none" />
+      <path
+         id="rect3904"
+         d="m 387.68886,241.83192 c -19.3408,18.01286 -80.1374,79.0865 -105.42315,105.69837 2.59137,0.92636 5.37608,1.42344 8.29341,1.42344 l 20.30977,0 42.9199,-42.94564 35.38319,-35.43469 0,-20.29167 c 0,-2.96634 -0.52845,-5.82163 -1.48312,-8.44981 z m -111.59781,11.751 c -3.51334,-0.003 -6.95347,0.82507 -10.07921,2.33202 l 0,42.58221 c 3.70805,1.62184 7.99235,2.31992 12.59145,1.87774 8.19177,-0.7876 8.65346,-0.58003 16.67762,7.57151 4.54164,4.61375 8.64455,8.38924 9.11064,8.38924 0.4661,0 3.42052,-2.48972 6.56814,-5.54235 l 5.72064,-5.54235 -9.01984,-9.14639 c -8.34705,-8.4571 -8.98791,-9.66834 -8.56582,-16.53619 0.61273,-9.96975 -1.80486,-15.61732 -9.08038,-21.16996 -4.33811,-3.31082 -9.18641,-4.81107 -13.92324,-4.81548 z m -0.72643,14.29502 c 6.24411,0 10.13975,3.31151 10.13975,8.60124 0,6.06311 -3.98298,10.44869 -9.50412,10.44869 -2.24225,0 -5.31546,-1.23001 -6.81028,-2.72574 -5.62829,-5.63165 -1.58215,-16.32419 6.17465,-16.32419 z m 104.33351,19.11051 -37.13874,37.161 -24.75915,24.80428 29.42041,0 17.46459,-17.50534 24.48674,-24.53171 0,-10.63041 -2.05821,-2.02917 -7.41564,-7.26865 z m -1.75554,39.7656 -17.22245,17.29334 -4.87313,4.90634 8.77769,0 c 9.67596,0 18.00231,-5.55746 22.00478,-13.65901 l -1.27125,-1.24173 -7.41564,-7.29894 z"
+         style="fill:#e99416;fill-opacity:1;stroke:none"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:connector-curvature="0"
+         d="m 342.43792,278.46494 30.96282,-30.99272 -3.80287,-3.89683 c -2.09156,-2.14324 -4.26153,-3.89681 -4.82212,-3.89681 -1.55756,0 -69.46642,68.31381 -68.68556,69.09514 0.37595,0.37617 3.99135,0.68395 8.03424,0.68395 l 7.35068,0 30.96281,-30.99273 z m 10.09948,14.24937 16.71283,-16.74336 -4.15418,-4.07946 -4.15418,-4.07946 -20.79345,20.82281 -20.79347,20.82283 8.23481,0 8.2348,0 16.71284,-16.74336 z m 14.18086,11.13633 5.54519,-5.60703 -4.14997,-4.07533 -4.14997,-4.07532 -9.64025,9.68235 -9.64025,9.68236 8.24503,0 8.24502,0 5.5452,-5.60703 z m -52.26751,-22.69917 3.20491,-3.10818 -5.04951,-5.1161 c -4.67445,-4.73608 -5.03055,-5.42469 -4.79418,-9.27078 0.34314,-5.58318 -1.01163,-8.73939 -5.08601,-11.84894 -8.63787,-6.59236 -20.92939,-0.33998 -20.92939,10.64623 0,7.9993 6.38028,13.648 14.53053,12.86439 4.58749,-0.44107 4.85161,-0.32112 9.34524,4.24384 2.54337,2.58376 4.83789,4.69774 5.09891,4.69774 0.26102,0 1.91679,-1.39869 3.6795,-3.1082 z M 291.0672,266.26109 c -3.15191,-3.15379 -0.89022,-9.13774 3.45368,-9.13774 3.49678,0 5.67858,1.84832 5.67858,4.81064 0,3.39541 -2.23524,5.85006 -5.32715,5.85006 -1.25569,0 -2.96799,-0.68533 -3.80511,-1.52296 z"
+         style="fill:#ffffff"
+         id="path3022" />
+      <g
+         transform="matrix(0.9685733,0,0,0.96915407,139.41333,-0.91088554)"
+         id="text3018"
+         style="font-size:42.92330933px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Blue Highway;-inkscape-font-specification:Blue Highway Bold">
+        <path
+           id="path3912"
+           style="fill:#ffffff;font-family:Blue Highway;-inkscape-font-specification:Blue Highway Bold"
+           d="m 172.82021,339.21142 c -3e-5,3.97757 -1.10173,7.08235 -3.3051,9.31436 l 1.58817,1.8457 -3.90603,3.26217 -1.93154,-2.48955 c -1.60249,0.51508 -3.19065,0.77262 -4.76449,0.77262 -3.63419,0 -6.53866,-1.20185 -8.71343,-3.60556 -2.14617,-2.4037 -3.21926,-5.43694 -3.21925,-9.09974 -1e-5,-3.8917 1.04446,-6.95355 3.1334,-9.18559 2.11754,-2.2606 5.10786,-3.39091 8.97097,-3.39094 3.83446,3e-5 6.83909,1.14465 9.0139,3.43387 2.0889,2.23203 3.13337,5.27958 3.1334,9.14266 m -6.09511,0 c -2e-5,-5.06493 -2.01742,-7.5974 -6.05219,-7.59742 -4.0348,2e-5 -6.05219,2.53249 -6.05219,7.59742 0,5.09358 1.96016,7.64036 5.8805,7.64035 0.4006,1e-5 0.82983,-0.0286 1.2877,-0.0858 l -2.91879,-3.60555 4.20649,-2.79002 2.79001,3.51971 c 0.57229,-1.17323 0.85845,-2.73277 0.85847,-4.67864"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path3914"
+           style="fill:#ffffff;font-family:Blue Highway;-inkscape-font-specification:Blue Highway Bold"
+           d="m 195.92032,351.44457 -5.15079,0 0,-1.63109 c -1.37356,1.2877 -3.14772,1.93155 -5.32249,1.93155 -2.08894,0 -3.77726,-0.61524 -5.06495,-1.8457 -1.28771,-1.25908 -1.93156,-2.93309 -1.93155,-5.02203 l 0,-12.53361 5.1508,0 0.0429,10.81668 c -1e-5,2.46094 1.08738,3.69141 3.26217,3.6914 1.05876,1e-5 1.96015,-0.34338 2.70417,-1.03016 0.7726,-0.71538 1.15891,-1.60246 1.15893,-2.66124 l 0,-10.81668 5.15079,0 0,19.10088"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path3916"
+           style="fill:#ffffff;font-family:Blue Highway;-inkscape-font-specification:Blue Highway Bold"
+           d="m 219.13244,348.7404 c -1.80279,2.08893 -4.27804,3.1334 -7.42573,3.1334 -3.00464,0 -5.37973,-0.88708 -7.12527,-2.66125 -1.71693,-1.80277 -2.5754,-4.22078 -2.5754,-7.25404 0,-2.86154 0.90139,-5.22232 2.70417,-7.08234 1.83139,-1.88861 4.16355,-2.83292 6.9965,-2.83294 2.68985,2e-5 4.95047,0.87279 6.78188,2.61832 l -3.90602,2.96171 c -0.7154,-0.68676 -1.67402,-1.03015 -2.87586,-1.03016 -1.4594,1e-5 -2.57541,0.55802 -3.34802,1.67401 -0.68678,0.97294 -1.03016,2.21771 -1.03016,3.73433 0,3.57695 1.47369,5.36541 4.4211,5.36541 1.31631,0 2.34646,-0.40061 3.09048,-1.20185 l 4.29233,2.5754"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path3918"
+           style="fill:#ffffff;font-family:Blue Highway;-inkscape-font-specification:Blue Highway Bold"
+           d="m 240.01396,345.52115 c -2e-5,4.17787 -2.97603,6.2668 -8.92805,6.2668 -1.74555,0 -4.12064,-0.60092 -7.12527,-1.80278 l 1.80278,-4.07771 c 1.63108,0.97293 3.57694,1.45939 5.83757,1.45939 2.00308,0 3.00462,-0.57231 3.00464,-1.71693 -2e-5,-0.54369 -0.91571,-1.04446 -2.7471,-1.50232 -2.40371,-0.60092 -4.09202,-1.17323 -5.06495,-1.71693 -1.83139,-1.03015 -2.74709,-2.56108 -2.74709,-4.59279 0,-2.11754 0.95862,-3.72001 2.87586,-4.80741 1.57385,-0.91568 3.5054,-1.37353 5.79465,-1.37355 2.63262,2e-5 4.79309,0.55802 6.48142,1.67401 l -1.58816,4.46402 c -1.97449,-1.11599 -3.90604,-1.67399 -5.79465,-1.67401 -1.40217,2e-5 -2.10325,0.50079 -2.10324,1.50232 -1e-5,0.60094 0.88707,1.11602 2.66124,1.54524 2.43231,0.60094 4.09201,1.15894 4.97911,1.67401 1.77414,1.05878 2.66122,2.61833 2.66124,4.67864"
+           inkscape:connector-curvature="0" />
+      </g>
+      <rect
+         style="fill:none;stroke:#634e2d;stroke-width:4.84431839;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+         id="rect3909"
+         width="123.15714"
+         height="123.23098"
+         x="266.02008"
+         y="225.71243"
+         ry="24.56002" />
+    </g>
+  </g>
+</svg>
diff --git a/qucs/qucs-s.desktop b/qucs/qucs-s.desktop
new file mode 100644
index 00000000..b6c7f188
--- /dev/null
+++ b/qucs/qucs-s.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Qucs-S
+Comment=An Universal GUI for Circuit Simulators
+Exec=qucs-s %U
+Icon=qucs-s
+Terminal=false
+
+Type=Application
+Categories=Education;Electronics
+StartupNotify=false
diff --git a/qucs/qucs.cpp b/qucs/qucs.cpp
index 8bf10269..98e0385a 100644
--- a/qucs/qucs.cpp
+++ b/qucs/qucs.cpp
@@ -123,7 +123,7 @@ const char *empty_xpm[] = {  // provides same height than "smallsave_xpm"
 
 QucsApp::QucsApp()
 {
-  setWindowTitle("Qucs " PACKAGE_VERSION);
+  setWindowTitle(QUCS_NAME " " PACKAGE_VERSION);
 
   QucsFileFilter =
     tr("Schematic") + " (*.sch);;" +