diff --git a/src/codegen.cpp b/src/codegen.cpp
index f4defb8405fa8e4e03ee49a31d224c91e62b9004..d002c716efe1dd88aedad97685a16fa327a0a631 100644
--- a/src/codegen.cpp
+++ b/src/codegen.cpp
@@ -2876,6 +2876,7 @@ static void do_code_gen(CodeGen *g) {
         if (handle_is_ptr(fn_type->data.fn.fn_type_id.return_type)) {
             LLVMValueRef first_arg = LLVMGetParam(fn_table_entry->fn_value, 0);
             LLVMAddAttribute(first_arg, LLVMStructRetAttribute);
+            LLVMZigAddNonNullAttr(fn_table_entry->fn_value, 1);
         }
 
         // set parameter attributes
@@ -2903,8 +2904,7 @@ static void do_code_gen(CodeGen *g) {
                 LLVMAddAttribute(argument_val, LLVMReadOnlyAttribute);
             }
             if (param_type->id == TypeTableEntryIdPointer) {
-                // when https://github.com/andrewrk/zig/issues/82 is fixed, add
-                // non null attribute here
+                LLVMZigAddNonNullAttr(fn_table_entry->fn_value, gen_index + 1);
             }
             if (is_byval) {
                 // TODO
diff --git a/src/zig_llvm.cpp b/src/zig_llvm.cpp
index b0e32e8b6b999229d241ebdaea0029d330a11bbc..5749a996d505e75e4d777f332ea9e45f30837b87 100644
--- a/src/zig_llvm.cpp
+++ b/src/zig_llvm.cpp
@@ -140,6 +140,16 @@ LLVMValueRef LLVMZigBuildCall(LLVMBuilderRef B, LLVMValueRef Fn, LLVMValueRef *A
     return wrap(unwrap(B)->Insert(call_inst));
 }
 
+void LLVMZigAddNonNullAttr(LLVMValueRef fn, unsigned i)
+{
+    assert( isa<Function>(unwrap(fn)) );
+
+    Function *unwrapped_function = reinterpret_cast<Function*>(unwrap(fn));
+
+    unwrapped_function->addAttribute(i, Attribute::NonNull);
+}
+
+
 LLVMZigDIType *LLVMZigCreateDebugPointerType(LLVMZigDIBuilder *dibuilder, LLVMZigDIType *pointee_type,
         uint64_t size_in_bits, uint64_t align_in_bits, const char *name)
 {
diff --git a/src/zig_llvm.hpp b/src/zig_llvm.hpp
index 74b2499276158a80847edcbb3ac2499267eb3b36..aa50cddaa178e99938f6d32adf24e22fe27d5d16 100644
--- a/src/zig_llvm.hpp
+++ b/src/zig_llvm.hpp
@@ -39,6 +39,8 @@ void LLVMZigOptimizeModule(LLVMTargetMachineRef targ_machine_ref, LLVMModuleRef
 LLVMValueRef LLVMZigBuildCall(LLVMBuilderRef B, LLVMValueRef Fn, LLVMValueRef *Args,
         unsigned NumArgs, unsigned CC, const char *Name);
 
+// 0 is return value, 1 is first arg
+void LLVMZigAddNonNullAttr(LLVMValueRef fn, unsigned i);
 
 LLVMZigDIType *LLVMZigCreateDebugPointerType(LLVMZigDIBuilder *dibuilder, LLVMZigDIType *pointee_type,
         uint64_t size_in_bits, uint64_t align_in_bits, const char *name);