diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/blueprintMapping.txt b/gemp-lotr/gemp-lotr-cards/src/main/resources/blueprintMapping.txt
index aa6a27ccf..dbd414872 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/resources/blueprintMapping.txt
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/blueprintMapping.txt
@@ -198,3 +198,13 @@
 15_201,15_184
 15_202,15_185
 15_203,15_186
+# Masterworks in Rise of Saruman
+17_149,17_24
+17_150,17_20
+17_151,17_36
+17_152,17_93
+17_153,17_98
+17_154,17_102
+17_155,17_141
+17_156,17_142
+17_157,17_143
\ No newline at end of file
diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/LotroServer.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/LotroServer.java
index d18a870d9..462ca0d76 100644
--- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/LotroServer.java
+++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/LotroServer.java
@@ -51,12 +51,12 @@ public class LotroServer extends AbstractServer {
 
         // Hunters have 1-194 normal cards, 9 "O" cards, and 3 extra to cover the different culture versions of 15_60
 
-        final int[] cardCounts = new int[]{129, 365, 122, 122, 365, 128, 128, 365, 122, 52, 122, 266, 203, 203, 15, 206, 6};
+        final int[] cardCounts = new int[]{129, 365, 122, 122, 365, 128, 128, 365, 122, 52, 122, 266, 203, 203, 15, 206, 6, 157};
 
         Thread thr = new Thread(
                 new Runnable() {
                     public void run() {
-                        for (int i = 0; i <= 16; i++) {
+                        for (int i = 0; i <= 17; i++) {
                             for (int j = 1; j <= cardCounts[i]; j++) {
                                 String blueprintId = i + "_" + j;
                                 try {
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html b/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html
index a43a520d6..17190e64d 100644
--- a/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html
+++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html
@@ -1,6 +1,7 @@
 <pre style="font-size:80%">
 <b>29 Feb. 2012</b>
 - "Get Off the Road!" now discards cards from Free People player's deck.
+- Added set 17 (Rise of Saruman).
 
 <b>22 Feb. 2012</b>
 - "Sharp Defense" now adds +2 for each possession, instead of +1.
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/jCards.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/jCards.js
index 2367fa434..2c49ec5ac 100644
--- a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/jCards.js
+++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/jCards.js
@@ -141,6 +141,8 @@ var Card = Class.extend({
             return (cardNo >= 185 && cardNo <= 194);
         if (setNo == 15)
             return (cardNo >= 187 && cardNo <= 194);
+        if (setNo == 17)
+            return (cardNo >= 145 && cardNo <= 148);
         return false;
     },
 
@@ -185,6 +187,8 @@ var Card = Class.extend({
     },
 
     getMasterworksOffset: function(setNo) {
+        if (setNo == 17)
+            return 148;
         return 194;
     },
 
@@ -195,6 +199,8 @@ var Card = Class.extend({
             return cardNo > 194;
         if (setNo == 15)
             return cardNo > 194 && cardNo < 204;
+        if (setNo == 17)
+            return cardNo > 148;
         return false;
     },