From cdd7ffc387770e00dbbfd911cd08288132b183e4 Mon Sep 17 00:00:00 2001
From: Will Holmgren <william.holmgren@gmail.com>
Date: Sat, 30 Apr 2016 08:01:53 -0700
Subject: [PATCH] update sam file base url

---
 docs/sphinx/source/whatsnew.rst        |  1 +
 docs/sphinx/source/whatsnew/v0.3.2.txt | 18 ++++++++++++++++++
 pvlib/pvsystem.py                      |  2 +-
 3 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 docs/sphinx/source/whatsnew/v0.3.2.txt

diff --git a/docs/sphinx/source/whatsnew.rst b/docs/sphinx/source/whatsnew.rst
index 5689f6de0b..4d8b60658c 100644
--- a/docs/sphinx/source/whatsnew.rst
+++ b/docs/sphinx/source/whatsnew.rst
@@ -6,6 +6,7 @@ What's New
 
 These are new features and improvements of note in each release.
 
+.. include:: whatsnew/v0.3.2.txt
 .. include:: whatsnew/v0.3.1.txt
 .. include:: whatsnew/v0.3.0.txt
 .. include:: whatsnew/v0.2.2.txt
diff --git a/docs/sphinx/source/whatsnew/v0.3.2.txt b/docs/sphinx/source/whatsnew/v0.3.2.txt
new file mode 100644
index 0000000000..88330bb393
--- /dev/null
+++ b/docs/sphinx/source/whatsnew/v0.3.2.txt
@@ -0,0 +1,18 @@
+.. _whatsnew_0320:
+
+v0.3.1 (May 3, 2016)
+-----------------------
+
+This is a minor release from 0.3.1.
+We recommend that all users upgrade to this version.
+
+Bug fixes
+~~~~~~~~~
+
+* Updates the SAM file URL. (:issue:`152`)
+
+
+Contributors
+~~~~~~~~~~~~
+
+* Will Holmgren
diff --git a/pvlib/pvsystem.py b/pvlib/pvsystem.py
index 3c9eb03aed..c909f7f92f 100644
--- a/pvlib/pvsystem.py
+++ b/pvlib/pvsystem.py
@@ -940,7 +940,7 @@ def retrieve_sam(name=None, samfile=None):
 
     if name is not None:
         name = name.lower()
-        base_url = 'https://sam.nrel.gov/sites/sam.nrel.gov/files/'
+        base_url = 'https://sam.nrel.gov/sites/default/files/'
         if name == 'cecmod':
             url = base_url + 'sam-library-cec-modules-2015-6-30.csv'
         elif name == 'sandiamod':