diff --git a/development/eclipse-cpp/README b/development/eclipse-cpp/README
index d615f3191e..79758796c2 100644
--- a/development/eclipse-cpp/README
+++ b/development/eclipse-cpp/README
@@ -10,3 +10,15 @@ This package includes:
     - Eclipse Git Team Provider
     - Mylyn Task List
     - Remote System Explorer
+
+**********
+UPGRADING:
+**********
+if you find an error during Eclipse initialization, check
+this two files:
+
+/opt/eclipse/configuration/config.ini
+/opt/eclipse/eclipse.ini
+
+If you haven't done modifications in those files, overwrite
+them with config.ini.new and eclipse.ini.new.
diff --git a/development/eclipse-cpp/eclipse-cpp.SlackBuild b/development/eclipse-cpp/eclipse-cpp.SlackBuild
index 951396e870..93abf5c24c 100644
--- a/development/eclipse-cpp/eclipse-cpp.SlackBuild
+++ b/development/eclipse-cpp/eclipse-cpp.SlackBuild
@@ -26,8 +26,8 @@
 # This script is just a binary repackaging.
 
 PRGNAM=eclipse-cpp
-VERSION=${VERSION:-4.4}
-SRCVERSION=luna-R
+VERSION=${VERSION:-4.4.1}
+SRCVERSION=luna-SR1
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -64,7 +64,7 @@ find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
   -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 # Add a wrapper to run eclipse in /usr/bin
 # Its going to change the working directory to $HOME, so when you import/export
@@ -80,16 +80,15 @@ chmod 0755 $PKG/usr/bin/$PRGNAM
 
 # Add eclipse to KDE/GNOME/XFCE menu and install an icon for them
 install -D -m 0644 $CWD/$PRGNAM.desktop $PKG/usr/share/applications/$PRGNAM.desktop
-install -D -m 0644 $CWD/$PRGNAM.png $PKG/usr/share/pixmaps/$PRGNAM.png
+install -D -m 0644 "$PKG/opt/$PRGNAM/plugins/org.eclipse.cdt.debug.application_1.0.0.201409172108/eclipse48.png"\
+	$PKG/usr/share/pixmaps/$PRGNAM.png
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 # Don't clobber any existing config file
-mv $PKG/opt/$PRGNAM/configuration/config.ini \
-  $PKG/opt/$PRGNAM/configuration/config.ini.new
-mv $PKG/opt/$PRGNAM/eclipse.ini \
-  $PKG/opt/$PRGNAM/eclipse.ini.new
+mv $PKG/opt/$PRGNAM/configuration/config.ini $PKG/opt/$PRGNAM/configuration/config.ini.new
+mv $PKG/opt/$PRGNAM/eclipse.ini $PKG/opt/$PRGNAM/eclipse.ini.new
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cd $PKG/opt/$PRGNAM
diff --git a/development/eclipse-cpp/eclipse-cpp.desktop b/development/eclipse-cpp/eclipse-cpp.desktop
index 7dac3874af..a4802ee4ef 100644
--- a/development/eclipse-cpp/eclipse-cpp.desktop
+++ b/development/eclipse-cpp/eclipse-cpp.desktop
@@ -1,9 +1,9 @@
 [Desktop Entry]
 Type=Application
 Exec=env SWT_GTK3=0 eclipse-cpp
-Name=Eclipse CDT
-GenericName=Eclipse C and C++ Integrated Development Environment
-Comment=Eclipse C and C++ Integrated Development Environment
+Name=Eclipse C/C++
+GenericName=Eclipse IDE for C/C++ Developers
+Comment=Eclipse IDE for C/C++ Developers
 Icon=eclipse-cpp
 StartupNotify=true
 Categories=Qt;KDE;GNOME;Development;
diff --git a/development/eclipse-cpp/eclipse-cpp.info b/development/eclipse-cpp/eclipse-cpp.info
index 49bb24f3ab..f7b632ef4c 100644
--- a/development/eclipse-cpp/eclipse-cpp.info
+++ b/development/eclipse-cpp/eclipse-cpp.info
@@ -1,10 +1,10 @@
 PRGNAM="eclipse-cpp"
-VERSION="4.4"
+VERSION="4.4.1"
 HOMEPAGE="http://www.eclipse.org"
-DOWNLOAD="http://download.eclipse.org/technology/epp/downloads/release/luna/R/eclipse-cpp-luna-R-linux-gtk.tar.gz"
-MD5SUM="5000f93cecf6ef9af112f0df6e8c87f3"
-DOWNLOAD_x86_64="http://download.eclipse.org/technology/epp/downloads/release/luna/R/eclipse-cpp-luna-R-linux-gtk-x86_64.tar.gz"
-MD5SUM_x86_64="b0a6ee33e8108a7ff4682ab911271b04"
+DOWNLOAD="http://download.eclipse.org/technology/epp/downloads/release/luna/SR1/eclipse-cpp-luna-SR1-linux-gtk.tar.gz"
+MD5SUM="5ffbcc92953c4ffdfc44853487e531c7"
+DOWNLOAD_x86_64="http://download.eclipse.org/technology/epp/downloads/release/luna/SR1/eclipse-cpp-luna-SR1-linux-gtk-x86_64.tar.gz"
+MD5SUM_x86_64="2b68d7dc1e08549a9af4f69226c74d97"
 REQUIRES="jdk"
 MAINTAINER="Andre Barboza"
 EMAIL="bmg.andre@gmail.com"