diff --git a/api/src/main/java/org/openmrs/module/attachments/AttachmentsConstants.java b/api/src/main/java/org/openmrs/module/attachments/AttachmentsConstants.java
index ff76ba88..301f47d0 100644
--- a/api/src/main/java/org/openmrs/module/attachments/AttachmentsConstants.java
+++ b/api/src/main/java/org/openmrs/module/attachments/AttachmentsConstants.java
@@ -9,9 +9,13 @@
  */
 package org.openmrs.module.attachments;
 
+import java.util.List;
+import java.util.Arrays;
+
 public class AttachmentsConstants {
 	
 	public static enum ContentFamily {
+		EXECUTABLE,
 		IMAGE,
 		PDF,
 		OTHER
@@ -69,6 +73,12 @@ public static enum ContentFamily {
 	
 	public static final String UNKNOWN_MIME_TYPE = "application/octet-stream";
 	
+	public static final List<String> EXECUTABLE_MIME_TYPES = Arrays.asList("application/vnd.microsoft.portable-executable",
+	    "type/javascript", "application/javascrip", "application/x-sh", "application/java-archive",
+	    "application/x-httpd-php", "application/xhtml+xml", "application/x-vbs", "text/vbscript", "text/x-python",
+	    "application/x-ms-installer", "application/x-elf", "application/x-applescript", "application/x-ruby",
+	    "application/x-perl", "application/wasm");
+	
 	public static final String ATT_VIEW_ORIGINAL = "complexdata.view.original";
 	
 	public static final String ATT_VIEW_THUMBNAIL = "complexdata.view.thumbnail";
diff --git a/api/src/main/java/org/openmrs/module/attachments/AttachmentsContext.java b/api/src/main/java/org/openmrs/module/attachments/AttachmentsContext.java
index 030c65f5..c90be770 100644
--- a/api/src/main/java/org/openmrs/module/attachments/AttachmentsContext.java
+++ b/api/src/main/java/org/openmrs/module/attachments/AttachmentsContext.java
@@ -345,6 +345,10 @@ public static double getCompressionRatio(double fileByteSize, double maxByteSize
 	 */
 	public static ContentFamily getContentFamily(String mimeType) {
 		ContentFamily contentFamily = ContentFamily.OTHER;
+		if (AttachmentsConstants.EXECUTABLE_MIME_TYPES.contains(mimeType)) {
+			contentFamily = ContentFamily.EXECUTABLE;
+		}
+		
 		if (StringUtils.equals(mimeType, "application/pdf")) {
 			contentFamily = ContentFamily.PDF;
 		}
diff --git a/omod-1.10/src/main/java/org/openmrs/module/attachments/rest/AttachmentResource1_10.java b/omod-1.10/src/main/java/org/openmrs/module/attachments/rest/AttachmentResource1_10.java
index 37b4e131..aebfdf0d 100644
--- a/omod-1.10/src/main/java/org/openmrs/module/attachments/rest/AttachmentResource1_10.java
+++ b/omod-1.10/src/main/java/org/openmrs/module/attachments/rest/AttachmentResource1_10.java
@@ -57,8 +57,8 @@ public class AttachmentResource1_10 extends DataDelegatingCrudResource<Attachmen
 	private ComplexObsSaver obsSaver = Context.getRegisteredComponent(AttachmentsConstants.COMPONENT_COMPLEXOBS_SAVER,
 	    ComplexObsSaver.class);
 	
-	private AttachmentsContext ctx = Context
-	        .getRegisteredComponent(AttachmentsConstants.COMPONENT_ATT_CONTEXT, AttachmentsContext.class);
+	private AttachmentsContext ctx = Context.getRegisteredComponent(AttachmentsConstants.COMPONENT_ATT_CONTEXT,
+	    AttachmentsContext.class);
 	
 	@Override
 	public Attachment newDelegate() {
@@ -112,7 +112,7 @@ public Object upload(MultipartFile file, RequestContext context) throws Response
 			file = new Base64MultipartFile(base64Content);
 		}
 		// Verify File Size
-		if (ctx.getMaxUploadFileSize() * 1024 * 1024 < (double)file.getSize()) {
+		if (ctx.getMaxUploadFileSize() * 1024 * 1024 < (double) file.getSize()) {
 			throw new IllegalRequestException("The file  exceeds the maximum size");
 		}
 		
@@ -147,6 +147,9 @@ public Object upload(MultipartFile file, RequestContext context) throws Response
 				obs = obsSaver.saveImageAttachment(visit, patient, encounter, fileCaption, file, instructions);
 				break;
 			
+			case EXECUTABLE:
+				throw new IllegalRequestException("File type is not allowed as attachment.");
+				
 			case OTHER:
 			default:
 				obs = obsSaver.saveOtherAttachment(visit, patient, encounter, fileCaption, file, instructions);
diff --git a/omod-1.10/src/test/java/org/openmrs/module/attachments/rest/AttachmentRestController1_10Test.java b/omod-1.10/src/test/java/org/openmrs/module/attachments/rest/AttachmentRestController1_10Test.java
index 0b00cde2..a300e8a2 100644
--- a/omod-1.10/src/test/java/org/openmrs/module/attachments/rest/AttachmentRestController1_10Test.java
+++ b/omod-1.10/src/test/java/org/openmrs/module/attachments/rest/AttachmentRestController1_10Test.java
@@ -439,6 +439,27 @@ public void postAttachment_shouldNotUploadFileAboveSizeLimit() throws Exception
 		SimpleObject response = deserialize(handle(request));
 	}
 	
+	@Test(expected = IllegalRequestException.class)
+	public void postAttachment_shouldThrowOnExecutableFile() throws Exception {
+		// Setup
+		String dotExeMimeType = "application/vnd.microsoft.portable-executable";
+		String fileCaption = "Test file caption";
+		String fileName = "testFile1.dat";
+		Patient patient = Context.getPatientService().getPatient(2);
+		Visit visit = Context.getVisitService().getVisit(1);
+		
+		MockMultipartHttpServletRequest request = newUploadRequest(getURI());
+		MockMultipartFile dotExeFile = new MockMultipartFile("file", fileName, dotExeMimeType, randomData);
+		
+		request.addFile(dotExeFile);
+		request.addParameter("patient", patient.getUuid());
+		request.addParameter("visit", visit.getUuid());
+		request.addParameter("fileCaption", fileCaption);
+		
+		// Replay
+		SimpleObject response = deserialize(handle(request));
+	}
+	
 	@Test
 	public void getAttachmentBytes_shouldDownloadFile() throws Exception {