diff --git a/local/config/vufind/config.ini b/local/config/vufind/config.ini
index f75db140dc3ccbf361e7c57de37c69cf8a75828d..5e6d1bec00cf313f3f5cd1412ea2a7035a122bcb 100644
--- a/local/config/vufind/config.ini
+++ b/local/config/vufind/config.ini
@@ -77,9 +77,11 @@ defaultLoggedInModule = MyResearch
 ; or omit to attempt to retain the user's current context after log out.
 ;logOutRoute = home
 ; This tab will show by default when a record is viewed:
-defaultRecordTab= Holdings
+defaultRecordTab = Holdings
 ; Hide the holdings tab if no holdings are available from the ILS
 hideHoldingsTabWhenEmpty = false
+; Whether to load all tabs (including default tab) via ajax (default is false):
+ajaxTabs = true
 ; This page will show by default when a user accesses the MyResearch module:
 defaultAccountPage = Profile
 ; Allow access to the Admin module? (See the access.AdminModule setting in
@@ -97,6 +99,8 @@ showBookBag = false
 bookBagMaxSize = 20
 ; Display bulk items (export, save, etc.) and checkboxes on search result screens?
 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"
 
@@ -288,6 +292,13 @@ ils_encryption_key = false
 ;minimum_password_length = 4
 ;maximum_password_length = 32
 
+; Uncomment this line to switch on "privacy mode" in which no user information
+; will be stored in the database. Note that this is incompatible with social
+; features, password resets, and many other features. It is not recommended for
+; use with "Database" authentication, since the user will be forced to create a
+; new account upon every login.
+;privacy = true
+
 ; See the comments in library/VF/Auth/MultiAuth.php for full details
 ; on using multiple authentication methods.  Note that MultiAuth assumes login
 ; with username and password, so some methods (i.e. Shibboleth) may not be
@@ -562,7 +573,7 @@ showStyleBasedIcons = true
 ;coversize = false
 
 ; You can select Syndetics, LibraryThing, Summon, Amazon, Booksite, OpenLibrary,
-; Contentcafe and/or Google Books.
+; Contentcafe, Buchhandel.de and/or Google Books.
 ;   Note: Summon service takes a Serials Solutions client key, NOT Summon API key!
 coverimages     = OpenLibrary,Google,LibraryThing:7710c07c4a8c66b217b0d39e6c33abe0
 ;Syndetics:MySyndeticsId,Amazon:MyAccessKeyId,Booksite,LibraryThing:MyLibraryThingId,Google,OpenLibrary,Summon:MySerialsSolutionsClientKey,Contentcafe:MyContentCafeID
@@ -574,6 +585,13 @@ coverimages     = OpenLibrary,Google,LibraryThing:7710c07c4a8c66b217b0d39e6c33ab
 ; some services will never have images cached even if caching is enabled.
 coverimagesCache = true
 
+; This setting controls which proxied image URLs will be cached to local disk (when
+; using the ?proxy= parameter of the standard /Cover/Show routes). The setting may
+; contain one or more regular expressions matching hostnames. The example
+; below will match any images from the mylibrary.edu domain; you can also use
+; "/.*/" to turn on caching for all proxied images.
+;coverproxyCache[] = "/.*\.?mylibrary\.edu/"
+
 ; These settings control the image to display when no book cover is available.
 ; If makeDynamicCovers is not false and the GD library is installed, VuFind will draw
 ; cover images on the fly. Possible values: false, solid, grid
@@ -625,6 +643,14 @@ noCoverAvailableImage = images/noCover2.gif
 ; You can select from Google, OpenLibrary, HathiTrust.  You should consult
 ; http://code.google.com/apis/books/branding.html before using Google Book Search.
 ; previews       = Google,OpenLibrary,HathiTrust
+ 
+; This section is needed for Buchhandel.de cover loading. You need an authentication
+; token. It may also be necessary to customize your templates in order to comply with
+; terms of service; please look at http://info.buchhandel.de/handbuch_links for
+; details before turning this on.
+[Buchhandel]
+url = "https://api.vlb.de/api/v1/cover/"
+; token = "XXXXXX-XXXX-XXXXX-XXXXXXXXXXXX" 
 
 ; Possible HathiRights options = pd,ic,op,orph,und,umall,ic-world,nobody,pdus,cc-by,cc-by-nd,
 ; cc-by-nc-nd,cc-by-nc,cc-by-nc-sa,cc-by-sa,orphcand,cc-zero,und-world,icus
diff --git a/local/config/vufind/facets.ini b/local/config/vufind/facets.ini
index 70f05948c9a268b828172d157ba3bd5a0c2b52ac..f034da44690e6cf480b790cd05f5e9f5ae488b7f 100644
--- a/local/config/vufind/facets.ini
+++ b/local/config/vufind/facets.ini
@@ -48,7 +48,7 @@ dateRange[] = publishDate
 ;genericRange[] = example_field_str
 ; Any fields listed below will be treated as hierarchical facets
 ; (see https://wiki.apache.org/solr/HierarchicalFaceting but note that we always
-; use a trailing slash to avoid ambiquities)
+; use a trailing slash to avoid ambiguities)
 ;hierarchical[] = building
 ; Sort options for hierarchical facets:
 ; How hierarchical facets are sorted. Default is result count, but alternative ways
diff --git a/local/dev/httpd-vufind.conf.sample b/local/dev/httpd-vufind.conf.sample
index 70c08b36dadc4f497da5b3fde51e49a2a6de073e..fa86fc83d3cef57016913245e99375d53eff3665 100644
--- a/local/dev/httpd-vufind.conf.sample
+++ b/local/dev/httpd-vufind.conf.sample
@@ -25,12 +25,18 @@ Alias / /usr/local/vufind2/public/
   </IfModule>
   AllowOverride All
 
-  # Uncomment the following lines, if you wish to use the Shibboleth authentication
+#  php_value short_open_tag On
+
+  # If you wish to use the Shibboleth authentication, uncomment the following lines
+  # AND comment out the "Require all granted" line above. There must not be any other
+  # "Require" lines in this configuration section for the "Require shibboleth"
+  # directive to be effective.
   #AuthType shibboleth
-  #require shibboleth
+  #Require shibboleth
+</Directory>
 
+<Location />
   RewriteEngine On
-  RewriteBase /
 
   # If using VuDL, uncomment the following line, fill in your appropriate Fedora
   # server and port, and make sure that Apache mod_proxy and mod_proxy_http are
@@ -55,8 +61,21 @@ Alias / /usr/local/vufind2/public/
   # to override VuFind core features/settings.  Set to blank string ("") to disable.
   SetEnv VUFIND_LOCAL_DIR /usr/local/vufind2/local/dev
 
+  # This line can be used to force caching in a specific location other than the
+  # default location inside the local settings directory.
+  # Do not share this directory between multiple instances of VuFind or you may
+  # encounter unexpected side effects -- while this directory may be outside of the
+  # local settings directory, there should be exactly one separate cache location per
+  # local settings directory.
+  #SetEnv VUFIND_CACHE_DIR /usr/local/vufind2/local/cache
+
   # This line specifies additional Zend Framework 2 modules to load after the standard VuFind module.
   # Multiple modules may be specified separated by commas.  This mechanism can be used to override
   # core VuFind functionality without modifying core code.
   SetEnv VUFIND_LOCAL_MODULES finc
-</Directory>
+
+  # This line overrides the detection of VuFind base directory. By default it is determined from
+  # the location of the index.php file, but in case it is e.g. symlinked or there is another reason
+  # to define the path manually, you can uncomment and modify this line.
+  #SetEnv VUFIND_APPLICATION_PATH /usr/local/vufind2
+</Location>