diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000..0a13387
Binary files /dev/null and b/.DS_Store differ
diff --git a/README.md b/README.md
index 15b8e20..52ce0ff 100644
--- a/README.md
+++ b/README.md
@@ -13,6 +13,12 @@ your security groups that are properly tagged will be updated accordingly.
 
 For more information on ip-ranges.json, read the documentation on [AWS IP Address Ranges](http://docs.aws.amazon.com/general/latest/gr/aws-ip-ranges.html).
 
+## update_security_groups_lambda
+
+This AWS Lambda function is written in Python. It aims to automatically update the WAFv2 IPset when CloudFront IP ranges change.
+
+Setup is similar to what is described in the blog post here, simply replace the Lambda function and ensure the WAFv2 IPSet name contains 'cf-auto-update' - https://aws.amazon.com/blogs/security/how-to-automatically-update-your-security-groups-for-amazon-cloudfront-and-aws-waf-by-using-aws-lambda/
+
 ## amazon-cloudfront-staging-to-production
 
 This is a python command line script that replicates staging distribution to production.
diff --git a/update_wafv2_ipset_lambda/README.md b/update_wafv2_ipset_lambda/README.md
new file mode 100644
index 0000000..a564309
--- /dev/null
+++ b/update_wafv2_ipset_lambda/README.md
@@ -0,0 +1,107 @@
+# Setup
+Set up of the solution can be refer to this blog post.
+https://aws.amazon.com/blogs/security/how-to-automatically-update-your-security-groups-for-amazon-cloudfront-and-aws-waf-by-using-aws-lambda/
+
+## Use WAFv2 IPset to restrict ALB or API Gateway ingress traffic to CloudFront IP range only
+
+You could use WAF IPSet based rule to restrict the associated ALB or API Gateway to allow only traffic from the CloudFront IP range. This will reduce the attack surface from network layers if adversaries attempt to DDoS the ALB or API Gateway endpoints directly. 
+
+This Lambda function is to help you update the IPSet IP ranges automatically if CloudFront IP address ever changes using the AWS SNS topic. 
+
+## Configure WAFv2 IPSet 
+The function is looking for IPSet names that contain "cf-auto-update". You can change the keyword in the Python code.
+
+## Event Source
+
+This lambda function is designed to be subscribed to the 
+[AmazonIpSpaceChanged](http://docs.aws.amazon.com/general/latest/gr/aws-ip-ranges.html#subscribe-notifications) 
+SNS topic. In the _Add Event Source_ dialog, select **SNS** in the *Event source type*, and populate *SNS Topic* with `arn:aws:sns:us-east-1:806199016981:AmazonIpSpaceChanged`.
+
+
+## Policy
+
+Here is an example of required Lambda execution role permission policy.
+
+```
+{
+    "Version": "2012-10-17",
+    "Statement": [
+        {
+            "Sid": "VisualEditor0",
+            "Effect": "Allow",
+            "Action": [
+                "wafv2:ListIPSets",
+                "wafv2:UpdateIPSet"
+            ],
+            "Resource": "*"
+        }
+    ]
+}
+```
+
+For more information on ip-ranges.json, read the documentation on [AWS IP Address Ranges](http://docs.aws.amazon.com/general/latest/gr/aws-ip-ranges.html).
+
+## Test Lambda Function
+Now that you have created your function, it’s time to test it and initialize your security group:
+
+1.  In the Lambda console on the Functions page, choose your function, choose the Actions drop-down menu, and then Configure test event.
+2.  Enter the following as your sample event, which will represent an SNS notification.
+
+```
+{
+  "Records": [
+    {
+      "EventVersion": "1.0",
+      "EventSubscriptionArn": "arn:aws:sns:EXAMPLE",
+      "EventSource": "aws:sns",
+      "Sns": {
+        "SignatureVersion": "1",
+        "Timestamp": "1970-01-01T00:00:00.000Z",
+        "Signature": "EXAMPLE",
+        "SigningCertUrl": "EXAMPLE",
+        "MessageId": "95df01b4-ee98-5cb9-9903-4c221d41eb5e",
+        "Message": "{\"create-time\": \"yyyy-mm-ddThh:mm:ss+00:00\", \"synctoken\": \"0123456789\", \"md5\": \"7fd59f5c7f5cf643036cbd4443ad3e4b\", \"url\": \"https://ip-ranges.amazonaws.com/ip-ranges.json\"}",
+        "Type": "Notification",
+        "UnsubscribeUrl": "EXAMPLE",
+        "TopicArn": "arn:aws:sns:EXAMPLE",
+        "Subject": "TestInvoke"
+      }
+    }
+  ]
+}
+```
+3.  After you’ve added the test event, click Save and test. Your Lambda function will be invoked, and you should see log output at the bottom of the console similar to the following.
+<pre>
+Updating from https://ip-ranges.amazonaws.com/ip-ranges.json
+MD5 Mismatch: got <b>2e967e943cf98ae998efeec05d4f351c</b> expected 7fd59f5c7f5cf643036cbd4443ad3e4b: Exception
+Traceback (most recent call last):
+  File "/var/task/lambda_function.py", line 29, in lambda_handler
+    ip_ranges = json.loads(get_ip_groups_json(message['url'], message['md5']))
+  File "/var/task/lambda_function.py", line 50, in get_ip_groups_json
+    raise Exception('MD5 Missmatch: got ' + hash + ' expected ' + expected_hash)
+Exception: MD5 Mismatch: got <b>2e967e943cf98ae998efeec05d4f351c</b> expected 7fd59f5c7f5cf643036cbd4443ad3e4b
+</pre>
+You will see a message indicating there was a hash mismatch. Normally, a real SNS notification from the IP Ranges SNS topic will include the right hash, but because our sample event is a test case representing the event, you will need to update the sample event manually to have the expected hash.
+
+4.  Edit the sample event again, and this time change the md5 hash **that is bold** to be the first hash provided in the log output. In this example, we would update the sample event with the hash “2e967e943cf98ae998efeec05d4f351c”.
+
+
+5.  Click Save and test, and your Lambda function will be invoked.
+
+This time, you should see output indicating your security group was properly updated. If you go back to the EC2 console and view the security group you created, you will now see all the CloudFront IP ranges added as allowed points of ingress. If your log output is different, it should help you identify the issue.
+
+## Configure your Lambda function’s trigger
+After you have validated that your function is executing properly, it’s time to connect it to the SNS topic for IP changes. To do this, use the AWS Command Line Interface (CLI). Enter the following command, making sure to replace <Lambda ARN> with the Amazon Resource Name (ARN) of your Lambda function. You will find this ARN at the top right when viewing the configuration of your Lambda function.
+
+`aws sns subscribe --topic-arn arn:aws:sns:us-east-1:806199016981:AmazonIpSpaceChanged --protocol lambda --notification-endpoint <Lambda ARN>`
+
+You should receive an ARN of your Lambda function’s SNS subscription. Your Lambda function will now be invoked whenever AWS publishes new IP ranges!
+***
+
+Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance with the License. A copy of the License is located at
+
+    http://aws.amazon.com/apache2.0/
+
+or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
diff --git a/update_wafv2_ipset_lambda/lambda.py b/update_wafv2_ipset_lambda/lambda.py
new file mode 100644
index 0000000..5e89cff
--- /dev/null
+++ b/update_wafv2_ipset_lambda/lambda.py
@@ -0,0 +1,111 @@
+import boto3
+import hashlib
+import json
+import logging
+import urllib.request, urllib.error, urllib.parse
+import os
+
+def lambda_handler(event, context):
+    # Set up logging
+    if len(logging.getLogger().handlers) > 0:
+        logging.getLogger().setLevel(logging.ERROR)
+    else:
+        logging.basicConfig(level=logging.DEBUG)
+    
+    # Set the environment variable DEBUG to 'true' if you want verbose debug details in CloudWatch Logs.
+    try:
+        if os.environ['DEBUG'] == 'true':
+            logging.getLogger().setLevel(logging.INFO)
+    except KeyError:
+        pass
+
+    # If you want a different service, set the SERVICE environment variable.
+    # It defaults to CLOUDFRONT. Using 'jq' and 'curl' get the list of possible
+    # services like this:
+    # curl -s 'https://ip-ranges.amazonaws.com/ip-ranges.json' | jq -r '.prefixes[] | .service' ip-ranges.json | sort -u 
+    SERVICE = os.getenv( 'SERVICE', "CLOUDFRONT")
+    
+    message = json.loads(event['Records'][0]['Sns']['Message'])
+
+    # Load the ip ranges from the url
+    ip_ranges = json.loads(get_ip_groups_json(message['url'], message['md5']))
+
+    # Extract the service ranges
+    global_cf_ranges = get_ranges_for_service(ip_ranges, SERVICE, "GLOBAL")
+    region_cf_ranges = get_ranges_for_service(ip_ranges, SERVICE, "REGION")
+    cf_ranges = global_cf_ranges + region_cf_ranges
+
+    # Update the WAF IPSet groups
+    result = update_ipset(cf_ranges)
+    
+    return result
+
+def update_ipset(ip_ranges):
+    client = boto3.client('wafv2')
+    target_ip_sets = {}
+    token = []
+    for i in client.list_ip_sets(Scope='REGIONAL')['IPSets']:
+        if 'cf-auto-update' in i['Name']:
+            target_ip_sets.update({i['Name']:i['Id']})
+            token = i['LockToken']
+
+    for k, v in target_ip_sets.items():
+        client.update_ip_set(
+        Name=k,
+        Scope='REGIONAL',
+        Id=v,
+        Addresses=ip_ranges,
+        LockToken=token
+        )
+
+def get_ranges_for_service(ranges, service, subset):
+    
+    service_ranges = list()
+    for prefix in ranges['prefixes']:
+        if prefix['service'] == service and ((subset == prefix['region'] and subset == "GLOBAL") or (subset != 'GLOBAL' and prefix['region'] != 'GLOBAL')):
+            logging.info(('Found ' + service + ' region: ' + prefix['region'] + ' range: ' + prefix['ip_prefix']))
+            service_ranges.append(prefix['ip_prefix'])
+
+    return service_ranges
+
+def get_ip_groups_json(url, expected_hash):
+    
+    logging.debug("Updating from " + url)
+
+    response = urllib.request.urlopen(url)
+    ip_json = response.read()
+
+    m = hashlib.md5()
+    m.update(ip_json)
+    hash = m.hexdigest()
+
+    if hash != expected_hash:
+        raise Exception('MD5 Mismatch: got ' + hash + ' expected ' + expected_hash)
+
+    return ip_json
+
+# This is a handy test event you can use when testing your lambda function.
+'''
+Sample Event From SNS:
+{
+  "Records": [
+    {
+      "EventVersion": "1.0",
+      "EventSubscriptionArn": "arn:aws:sns:EXAMPLE",
+      "EventSource": "aws:sns",
+      "Sns": {
+        "SignatureVersion": "1",
+        "Timestamp": "1970-01-01T00:00:00.000Z",
+        "Signature": "EXAMPLE",
+        "SigningCertUrl": "EXAMPLE",
+        "MessageId": "95df01b4-ee98-5cb9-9903-4c221d41eb5e",
+        "Message": "{\"create-time\": \"yyyy-mm-ddThh:mm:ss+00:00\", \"synctoken\": \"0123456789\", \"md5\": \"45be1ba64fe83acb7ef247bccbc45704\", \"url\": \"https://ip-ranges.amazonaws.com/ip-ranges.json\"}",
+        "Type": "Notification",
+        "UnsubscribeUrl": "EXAMPLE",
+        "TopicArn": "arn:aws:sns:EXAMPLE",
+        "Subject": "TestInvoke"
+      }
+    }
+  ]
+}
+'''
\ No newline at end of file