diff --git a/openid-connect-common/src/main/java/org/mitre/openid/connect/service/ResourceSetService.java b/openid-connect-common/src/main/java/org/mitre/openid/connect/service/ResourceSetService.java
index c9e6e1bd4..d6500bb16 100644
--- a/openid-connect-common/src/main/java/org/mitre/openid/connect/service/ResourceSetService.java
+++ b/openid-connect-common/src/main/java/org/mitre/openid/connect/service/ResourceSetService.java
@@ -31,4 +31,6 @@ public interface ResourceSetService {
 
 	public ResourceSet getById(Long id);
 
+	public ResourceSet update(ResourceSet oldRs, ResourceSet newRs);
+
 }
diff --git a/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/DefaultResourceSetService.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/DefaultResourceSetService.java
index c89b0e6a9..6c3589d84 100644
--- a/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/DefaultResourceSetService.java
+++ b/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/DefaultResourceSetService.java
@@ -50,6 +50,24 @@ public class DefaultResourceSetService implements ResourceSetService {
 	public ResourceSet getById(Long id) {
 		return repository.getById(id);
 	}
+
+	@Override
+	public ResourceSet update(ResourceSet oldRs, ResourceSet newRs) {
+
+		if (oldRs.getId() == null || newRs.getId() == null
+				|| oldRs.getId() != newRs.getId()) {
+			
+			throw new IllegalArgumentException("Resource set IDs mismatched");
+			
+		}
+		
+		newRs.setOwner(oldRs.getOwner());
+		
+		ResourceSet saved = repository.save(newRs);
+		
+		return saved;
+		
+	}
 	
 	
 	
diff --git a/openid-connect-server/src/main/java/org/mitre/openid/connect/web/ResourceSetRegistrationEndpoint.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/web/ResourceSetRegistrationEndpoint.java
index f48ee0e08..00977ec1b 100644
--- a/openid-connect-server/src/main/java/org/mitre/openid/connect/web/ResourceSetRegistrationEndpoint.java
+++ b/openid-connect-server/src/main/java/org/mitre/openid/connect/web/ResourceSetRegistrationEndpoint.java
@@ -16,7 +16,8 @@
  *******************************************************************************/
 package org.mitre.openid.connect.web;
 
-import static org.mitre.util.JsonUtils.*;
+import static org.mitre.util.JsonUtils.getAsLong;
+import static org.mitre.util.JsonUtils.getAsString;
 import static org.mitre.util.JsonUtils.getAsStringSet;
 
 import org.mitre.oauth2.service.SystemScopeService;
@@ -138,6 +139,61 @@ public class ResourceSetRegistrationEndpoint {
 		
 	}
 
+	@RequestMapping(value = "/{id}", method = RequestMethod.PUT, consumes = MimeTypeUtils.APPLICATION_JSON_VALUE, produces = MimeTypeUtils.APPLICATION_JSON_VALUE)
+	public String updateResourceSet(@PathVariable ("id") Long id, @RequestBody String jsonString, Model m, Authentication auth) {
+		// if auth is OAuth, make sure we've got the right scope
+		if (auth instanceof OAuth2Authentication) {
+			OAuth2Authentication oAuth2Authentication = (OAuth2Authentication) auth;
+			if (oAuth2Authentication.getOAuth2Request().getScope() == null
+					|| oAuth2Authentication.getOAuth2Request().getScope().contains(SystemScopeService.RESOURCE_SET_REGISTRATION_SCOPE)) {
+				throw new InsufficientScopeException("Insufficient scope", ImmutableSet.of(SystemScopeService.RESOURCE_SET_REGISTRATION_SCOPE));
+			}
+		}
+
+		ResourceSet newRs = parseResourceSet(jsonString);
+
+		if (newRs == null // there was no resource set in the body
+				|| Strings.isNullOrEmpty(newRs.getName()) // there was no name (required)
+				|| newRs.getScopes() == null // there were no scopes (required)
+				|| newRs.getId() == null || !newRs.getId().equals(id) // the IDs didn't match
+			) {
+
+			logger.warn("Resource set registration missing one or more required fields.");
+			
+			m.addAttribute("code", HttpStatus.BAD_REQUEST);
+			m.addAttribute("error_description", "Resource request was missing one or more required fields.");
+			return JsonErrorView.VIEWNAME;
+		}
+
+		ResourceSet rs = resourceSetService.getById(id);
+		
+		if (rs == null) {
+			m.addAttribute("code", HttpStatus.NOT_FOUND);
+			m.addAttribute("error", "not_found");
+			return JsonErrorView.VIEWNAME;
+		} else {
+			if (!auth.getName().equals(rs.getOwner())) {
+				
+				logger.warn("Unauthorized resource set request from bad user; expected " + rs.getOwner() + " got " + auth.getName());
+				
+				// it wasn't issued to this user
+				m.addAttribute("code", HttpStatus.FORBIDDEN);
+				return JsonErrorView.VIEWNAME;
+			} else {
+				
+				ResourceSet saved = resourceSetService.update(rs, newRs);
+				
+				m.addAttribute("entity", saved);
+				m.addAttribute("location", config.getIssuer() + URL + "/" + rs.getId());
+				return ResourceSetEntityAbbreviatedView.VIEWNAME;
+			}
+			
+		}
+		
+		
+		
+	}
+	
 	private ResourceSet parseResourceSet(String jsonString) {
 
 		try {