From b446108549a991f2c021befbff4c9f79d11e7619 Mon Sep 17 00:00:00 2001
From: rshipp <github@rshipp.com>
Date: Sat, 9 May 2015 10:07:52 -0600
Subject: [PATCH] Add @glastopf and conpot

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index b28fa8c..35882c8 100644
--- a/README.md
+++ b/README.md
@@ -48,6 +48,8 @@ A curated list of awesome malware analysis tools and resources. Inspired by
 
 *Trap and collect your own samples.*
 
+* [Conpot](https://github.com/glastopf/conpot) - ICS/SCADA honeypot.
+* [Glastopf](http://glastopf.org/) - Web application honeypot.
 * [Thug](https://github.com/buffer/thug) - Low interaction honeyclient, for
   investigating malicious websites.