diff --git a/build.xml b/build.xml
index 2e0b082944f..95842ffa374 100644
--- a/build.xml
+++ b/build.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="vufind2" basedir="." default="main">
+<project name="vufind" basedir="." default="main">
   <property name="tmp" value="/tmp" />
   <property name="package"  value="${phing.project.name}" override="true" />
   <property name="builddir" value="${tmp}/build/${phing.project.name}" override="true" />
@@ -26,7 +26,7 @@
   <property name="php-cs-fixers" value="no_blank_lines_before_namespaces,function_call_space,trailing_spaces,unused_use,lowercase_keywords,encoding,parenthesis,php_closing_tag,visibility,duplicate_semicolon,extra_empty_lines,no_blank_lines_after_class_opening,no_empty_lines_after_phpdocs,operators_spaces,spaces_before_semicolon,ternary_spaces,concat_with_spaces,short_array_syntax,phpdoc_no_access,remove_leading_slash_use,eof_ending" />
 
 
-  <property name="version" value="2.5.3" />
+  <property name="version" value="3.0" />
 
   <!-- We only need the -p switch if the password is non-blank -->
   <if><not><equals arg1="${mysqlrootpass}" arg2="" /></not><then>
@@ -269,18 +269,18 @@
     <delete dir="${builddir}/packages" includeemptydirs="true" failonerror="false" />
     <mkdir dir="${builddir}/packages" />
     <delete dir="${builddir}/export" includeemptydirs="true" failonerror="false" />
-    <mkdir dir="${builddir}/export/vufind/usr/local/vufind2" />
+    <mkdir dir="${builddir}/export/vufind/usr/local/vufind" />
 
     <!-- load the relevant files into the work area -->
     <phingcall target="composer" />
-    <exec command="git archive HEAD --format=tar | tar -x -C ${builddir}/export/vufind/usr/local/vufind2" />
-    <copy todir = "${builddir}/export/vufind/usr/local/vufind2/vendor">
+    <exec command="git archive HEAD --format=tar | tar -x -C ${builddir}/export/vufind/usr/local/vufind" />
+    <copy todir = "${builddir}/export/vufind/usr/local/vufind/vendor">
       <fileset dir="${srcdir}/vendor" defaultexcludes="false" />
     </copy>
 
     <!-- create a version-specific symlink so that tar/zip packages will have
          appropriate directory structures. -->
-    <exec command="ln -s ${builddir}/export/vufind/usr/local/vufind2 ${builddir}/export/vufind-${version}" />
+    <exec command="ln -s ${builddir}/export/vufind/usr/local/vufind ${builddir}/export/vufind-${version}" />
 
     <!-- build the standard tar.gz archive -->
     <echo message="Building .tar.gz...." />
@@ -292,7 +292,7 @@
 
     <!-- build the DEB package -->
     <echo message="Building .deb...." />
-    <move file="${builddir}/export/vufind/usr/local/vufind2/packages/DEBIAN" todir="${builddir}/export/vufind" includeemptydirs="true"/>
+    <move file="${builddir}/export/vufind/usr/local/vufind/packages/DEBIAN" todir="${builddir}/export/vufind" includeemptydirs="true"/>
     <exec command="chmod 0775 ${builddir}/export/vufind/DEBIAN/postinst" />
     <exec command="dpkg-deb -b ${builddir}/export/vufind ${builddir}/packages/vufind_${version}.deb" checkreturn="true" />
 
diff --git a/config/vufind/config.ini b/config/vufind/config.ini
index 687be412c26..34dd0ce951a 100644
--- a/config/vufind/config.ini
+++ b/config/vufind/config.ini
@@ -103,7 +103,7 @@ showBulkOptions = false
 ; Should users be allowed to save searches in their accounts?
 allowSavedSearches = true
 ; Generator value to display in an HTML header <meta> tag:
-generator = "VuFind 2.5.3"
+generator = "VuFind 3.0"
 
 ; This section allows you to configure the mechanism used for storing user
 ; sessions.  Available types: File, Memcache, Database.
diff --git a/import-marc.sh b/import-marc.sh
index 531e02db9f5..389b79317bc 100755
--- a/import-marc.sh
+++ b/import-marc.sh
@@ -69,7 +69,7 @@ fi
 ##################################################
 if [ -z "$VUFIND_HOME" ]
 then
-  VUFIND_HOME="/usr/local/vufind2"
+  VUFIND_HOME="/usr/local/vufind"
 fi
 
 
diff --git a/packages/DEBIAN/changelog b/packages/DEBIAN/changelog
index a5603e16fae..a5eeea7332b 100644
--- a/packages/DEBIAN/changelog
+++ b/packages/DEBIAN/changelog
@@ -1,3 +1,9 @@
+vufind 3.0 distribution; urgency=low
+
+  * VuFind 3.0 release (see http://vufind.org/wiki/changelog for details) 
+
+ -- maintainer VuFind Project Administration Team <vufind-admins@lists.sourceforge.net>  Mo 25 Apr 2016 09:28:51 UTC
+
 vufind 2.5.3 distribution; urgency=low
 
   * VuFind 2.5.3 release (see http://vufind.org/wiki/changelog for details) 
diff --git a/packages/DEBIAN/conffiles b/packages/DEBIAN/conffiles
index d05e80e4240..2fdd394f067 100644
--- a/packages/DEBIAN/conffiles
+++ b/packages/DEBIAN/conffiles
@@ -1 +1 @@
-/usr/local/vufind2/solr/biblio/conf/solrconfig.xml
+/usr/local/vufind/solr/vufind/biblio/conf/solrconfig.xml
diff --git a/packages/DEBIAN/control b/packages/DEBIAN/control
index 37bbc23ea47..c7a43a460d7 100644
--- a/packages/DEBIAN/control
+++ b/packages/DEBIAN/control
@@ -1,5 +1,5 @@
-Package: vufind2
-Version: 2.5.3
+Package: vufind
+Version: 3.0
 Section: World Wide Web
 Priority: Optional
 Architecture: all
diff --git a/packages/DEBIAN/postinst b/packages/DEBIAN/postinst
index 3b51f88de42..2dd322432b1 100644
--- a/packages/DEBIAN/postinst
+++ b/packages/DEBIAN/postinst
@@ -1,11 +1,11 @@
 #!/bin/bash
 
-# Script for installing VuFind 2.x on Ubuntu
+# Script for installing VuFind on Ubuntu
 # This does not include the OCI8 libraries
 
 # Update the profile file to set required environment variables:
 sh -c 'echo export JAVA_HOME=\"/usr/lib/jvm/default-java\" > /etc/profile.d/vufind.sh'
-sh -c 'echo export VUFIND_HOME=\"/usr/local/vufind2\"  >> /etc/profile.d/vufind.sh'
+sh -c 'echo export VUFIND_HOME=\"/usr/local/vufind\"  >> /etc/profile.d/vufind.sh'
 sh -c 'echo export VUFIND_LOCAL_DIR=\"\$VUFIND_HOME/local\"  >> /etc/profile.d/vufind.sh'
 source /etc/profile.d/vufind.sh
 
@@ -29,5 +29,5 @@ APACHE_CONF_DIR=/etc/apache2/conf.d
 if [ ! -d $APACHE_CONF_DIR ]; then
   APACHE_CONF_DIR=/etc/apache2/conf-enabled
 fi
-ln -s $VUFIND_LOCAL_DIR/httpd-vufind.conf $APACHE_CONF_DIR/vufind2.conf
+ln -s $VUFIND_LOCAL_DIR/httpd-vufind.conf $APACHE_CONF_DIR/vufind.conf
 /etc/init.d/apache2 force-reload
diff --git a/public/index.php b/public/index.php
index c24a73866b5..5022468b6f5 100644
--- a/public/index.php
+++ b/public/index.php
@@ -86,7 +86,7 @@
     include_once "xhprof_lib/utils/xhprof_lib.php";
     include_once "xhprof_lib/utils/xhprof_runs.php";
     $xhprofRuns = new XHProfRuns_Default();
-    $suffix = 'vufind2';
+    $suffix = 'vufind';
     $xhprofRunId = $xhprofRuns->save_run($xhprofData, $suffix);
     $url = "$xhprof?run=$xhprofRunId&source=$suffix";
     echo "<a href='$url'>Profiler output</a>";